Git (произн. «гит») — распределённая система управления версиями файлов. Проект был создан Линусом Торвальдсом для управления разработкой ядра Linux. На сегодняшний день поддерживается Джунио Хамано (англ. Junio C. Hamano).
Примерами проектов, использующих Git, являются Linux kernel, Cairo, GNU Core Utilities, Mesa, Wine и некоторые дистрибутивы GNU/Linux.
Программа является свободной и выпущена под лицензией GNU GPL версии 2.
Система спроектирована как набор программ, специально разработанных с учётом их использования в скриптах. Это позволяет удобно создавать специализированные системы контроля версий на базе Git или пользовательские интерфейсы. Например, Cogito является именно таким примером фронтенда к репозиториям Git, а StGit использует Git для управления коллекцией патчей.
Git поддерживает быстрое разделение и слияние версий, включает инструменты для визуализации и навигации по нелинейной истории разработки. Как и Darcs, BitKeeper, Mercurial, SVK, Bazaar и Monotone, Git предоставляет каждому разработчику локальную копию всей истории разработки, изменения копируются из одного репозитория в другой.
Удалённый доступ к репозиториям Git обеспечивается git-daemon, SSH- или HTTP-сервером. TCP-сервис git-daemon входит в дистрибутив Git и является наряду с SSH наиболее распространённым и надёжным методом доступа. Метод доступа по HTTP, несмотря на ряд ограничений, очень популярен в контролируемых сетях, потому что позволяет использование существующих конфигураций сетевых фильтров.
Обмен изменениями с другими системами контроля версий:
CVS — импорт и экспорт, эмуляция CVS-сервера, в стандартной поставке
Subversion — импорт и экспорт (частично), в стандартной поставке
.tar.gz, .tar.bz2 (серии версионированых файлов) — импорт и экспорт, в стандартной поставке
* An unquoted value in the configuration file, when it contains more than one whitespaces in a row, got them replaced with a single space. * "git am" used to accept a single piece of e-mail per file (not a mbox) as its input, but multiple input format support in v1.6.4 broke it. Apparently many people have been depending on this feature. * The short help text for "git filter-branch" command was a single long line, wrapped by terminals, and was hard to read. * The "recursive" strategy of "git merge" segfaulted when a merge has more than one merge-bases, and merging of these merge-bases involves a rename/rename or a rename/add conflict. * "git pull --rebase" did not use the right fork point when the repository has already fetched from the upstream that rewinds the branch it is based on in an earlier fetch. * Explain the concept of fast-forward more fully in "git push" documentation, and hint to refer to it from an error message when the command refuses an update to protect the user. * The default value for pack.deltacachesize, used by "git repack", is now 256M, instead of unbounded. Otherwise a repack of a moderately sized repository would needlessly eat into swap. * Document how "git repack" (hence "git gc") interacts with a repository that borrows its objects from other repositories (e.g. ones created by "git clone -s"). * "git show" on an annotated tag lacked a delimiting blank line between the tag itself and the contents of the object it tags. * "git verify-pack -v" erroneously reported number of objects with too deep delta depths as "chain length 0" objects. * Long names of authors and committers outside US-ASCII were sometimes incorrectly shown in "gitweb". Downloads (~2,1 Mb)_ftp://ftp.kernel.org....6.4.1.tar.bz2
ЭЖД, 31.08.2009 - 11:48
Git 1.6.4.1
* --date=relative output between 1 and 5 years ago rounded the number of years when saying X years Y months ago, instead of rounding it down.
* "git add -p" did not handle changes in executable bits correctly (a regression around 1.6.3).
* "git apply" did not honor GNU diff's convention to mark the creation/deletion event with UNIX epoch timestamp on missing side.
* "git checkout" incorrectly removed files in a directory pointed by a symbolic link during a branch switch that replaces a directory with a symbolic link.
* "git clean -d -f" happily descended into a subdirectory that is managed by a separate git repository. It now requires two -f options for safety.
* "git fetch/push" over http transports had two rather grave bugs.
* "git format-patch --cover-letter" did not prepare the cover letter file for use with non-ASCII strings when there are the series contributors with non-ASCII names.
* "git pull origin branch" and "git fetch origin && git merge origin/branch" left different merge messages in the resulting commit. Downloads (~2,1 Mb)_ftp://ftp.kernel.org....6.4.2.tar.bz2
ЭЖД, 13.09.2009 - 13:57
git 1.6.4.3
* "git clone" from an empty repository gave unnecessary error message, even though it did everything else correctly.
* "git cvsserver" invoked git commands via "git-foo" style, which has long been deprecated.
* "git fetch" and "git clone" had an extra sanity check to verify the presense of the corresponding *.pack file before downloading *.idx file by issuing a HEAD request. Github server however sometimes gave 500 (Internal server error) response to HEAD even if a GET request for *.pack file to the same URL would have succeeded, and broke clone over HTTP from some of their repositories. As a workaround, this verification has been removed (as it is not absolutely necessary).
* "git grep" did not like relative pathname to refer outside the current directory when run from a subdirectory.
* an error message from "git push" was formatted in a very ugly way.
* "git svn" did not quote the subversion user name correctly when running its author-prog helper program. Downloads (~2,1 Mb)_ftp://ftp.kernel.org....6.4.3.tar.bz2
ЭЖД, 17.09.2009 - 17:12
git 1.6.4.4
* The workaround for Github server that sometimes gave 500 (Internal server error) response to HEAD requests in 1.6.4.3 introduced a regression that caused re-fetching projects over http to segfault in certain cases due to uninitialized pointer being freed.
* "git pull" on an unborn branch used to consider anything in the work tree and the index discardable.
* "git diff -b/w" did not work well on the incomplete line at the end of the file, due to an incorrect hashing of lines in the low-level xdiff routines.
* "git checkout-index --prefix=$somewhere" used to work when $somewhere is a symbolic link to a directory elsewhere, but v1.6.4.2 broke it.
* "git unpack-objects --strict", invoked when receive.fsckobjects configuration is set in the receiving repository of "git push", did not properly check the objects, especially the submodule links, it received. Downloads (~2,1 Mb)_ftp://ftp.kernel.org....6.4.4.tar.bz2
ЭЖД, 11.10.2009 - 10:55
git 1.6.5
» "ChangeLog" «
Updates since v1.6.4 -----
(subsystems)
* various updates to gitk, git-svn and gitweb.
(portability)
* more improvements on mingw port.
* mingw will also give FRSX as the default value for the LESS environment variable when the user does not have one.
* initial support to compile git on Windows with MSVC.
(performance)
* On major platforms, the system can be compiled to use with Linus's block-sha1 implementation of the SHA-1 hash algorithm, which outperforms the default fallback implementation we borrowed from Mozilla.
* Unnecessary inefficiency in deepening of a shallow repository has been removed.
* "git clone" does not grab objects that it does not need (i.e. referenced only from refs outside refs/heads and refs/tags hierarchy) anymore.
* The "git" main binary used to link with libcurl, which then dragged in a large number of external libraries. When using basic plumbing commands in scripts, this unnecessarily slowed things down. We now implement http/https/ftp transfer as a separate executable as we used to.
* "git clone" run locally hardlinks or copies the files in .git/ to newly created repository. It used to give new mtime to copied files, but this delayed garbage collection to trigger unnecessarily in the cloned repository. We now preserve mtime for these files to avoid this issue.
(usability, bells and whistles)
* Human writable date format to various options, e.g. --since=yesterday, master@{2000.09.17}, are taught to infer some omitted input properly.
* A few programs gave verbose "advice" messages to help uninitiated people when issuing error messages. An infrastructure to allow users to squelch them has been introduced, and a few such messages can be silenced now.
* refs/replace/ hierarchy is designed to be usable as a replacement of the "grafts" mechanism, with the added advantage that it can be transferred across repositories.
* "git am" learned to optionally ignore whitespace differences.
* "git am" handles input e-mail files that has CRLF line endings sensibly.
* "git am" learned "--scissors" option to allow you to discard early part of an incoming e-mail.
* "git archive -o output.zip" works without being told what format to use with an explicit "--format=zip".option.
* "git checkout", "git reset" and "git stash" learned to pick and choose to use selected changes you made, similar to "git add -p".
* "git clone" learned a "-b" option to pick a HEAD to check out different from the remote's default branch.
* "git clone" learned --recursive option.
* "git clone" from a local repository on a different filesystem used to copy individual object files without preserving the old timestamp, giving them extra lifetime in the new repository until they gc'ed.
* "git commit --dry-run $args" is a new recommended way to ask "what would happen if I try to commit with these arguments."
* "git commit --dry-run" and "git status" shows conflicted paths in a separate section to make them easier to spot during a merge.
* "git cvsimport" now supports password-protected pserver access even when the password is not taken from ~/.cvspass file.
* "git fast-export" learned --no-data option that can be useful when reordering commits and trees without touching the contents of blobs.
* "git fast-import" has a pair of new front-end in contrib/ area.
* "git init" learned to mkdir/chdir into a directory when given an extra argument (i.e. "git init this").
* "git instaweb" optionally can use mongoose as the web server.
* "git log --decorate" can optionally be told with --decorate=full to give the reference name in full.
* "git merge" issued an unnecessarily scary message when it detected that the merge may have to touch the path that the user has local uncommitted changes to. The message has been reworded to make it clear that the command aborted, without doing any harm.
* "git push" can be told to be --quiet.
* "git push" pays attention to url.$base.pushInsteadOf and uses a URL that is derived from the URL used for fetching.
* informational output from "git reset" that lists the locally modified paths is made consistent with that of "git checkout $another_branch".
* "git submodule" learned to give submodule name to scripts run with "foreach" subcommand.
* various subcommands to "git submodule" learned --recursive option.
* "git submodule summary" learned --files option to compare the work tree vs the commit bound at submodule path, instead of comparing the index.
* "git upload-pack", which is the server side support for "git clone" and "git fetch", can call a new post-upload-pack hook for statistics purposes.
(developers)
* With GIT_TEST_OPTS="--root=/p/a/t/h", tests can be run outside the source directory; using tmpfs may give faster turnaround.
* With NO_PERL_MAKEMAKER set, DESTDIR= is now honoured, so you can build for one location, and install into another location to tar it up.
* "git clone" takes up to two parameters, but did not complain when given more arguments than necessary and silently ignored them.
* "git cvsimport" did not read files given as command line arguments correctly when it is run from a subdirectory.
* "git diff --color-words -U0" didn't work correctly.
* The handling of blank lines at the end of file by "git diff/apply --whitespace" was inconsistent with the other kinds of errors. They are now colored, warned against, and fixed the same way as others.
* There was no way to allow blank lines at the end of file without allowing extra blanks at the end of lines. You can use blank-at-eof and blank-at-eol whitespace error class to specify them separately. The old trailing-space error class is now a short-hand to set both.
* "-p" option to "git format-patch" was supposed to suppress diffstat generation, but it was broken since 1.6.1.
* "git imap-send" did not compile cleanly with newer OpenSSL.
* "git help -a" outside of a git repository was broken.
* "git ls-files -i" was supposed to be inverse of "git ls-files" without -i with respect to exclude patterns, but it was broken since 1.6.5.2.
* "git ls-remote" outside of a git repository over http was broken.
* "git rebase -i" gave bogus error message when the command word was misspelled.
* "git receive-pack" that is run in response to "git push" did not run garbage collection nor update-server-info, but in larger hosting sites, these almost always need to be run. To help site administrators, the command now runs "gc --auto" and "u-s-i" by setting receive.autogc and receive.updateserverinfo configuration variables, respectively.
* Release notes spelled the package name with incorrect capitalization.
* "gitweb" did not escape non-ascii characters correctly in the URL.
* "gitweb" showed "patch" link even for merge commits.
* "git help" (without argument) used to check if you are in a directory under git control. There was no breakage in behaviour per-se, but this was unnecessary.
* "git prune-packed" gave progress output even when its standard error is not connected to a terminal; this caused cron jobs that run it to produce crufts.
* "git pack-objects --all-progress" is an option to ask progress output from write-object phase _if_ progress output were to be produced, and shouldn't have forced the progress output.
* "git apply -p --directory=" did not work well for a non-default value of n.
* "git merge foo HEAD" was misparsed as an old-style invocation of the command and produced a confusing error message. As it does not specify any other branch to merge, it shouldn't be mistaken as such. We will remove the old style "git merge HEAD ..." syntax in future versions, but not in this release,
* "git merge -m ..." added the standard merge message on its own after user-supplied message, which should have overrided the standard one. Downloads (~2,2 Mb)_ftp://ftp.kernel.org....6.5.4.tar.bz2
ЭЖД, 7.12.2009 - 11:38
git 1.6.5.5
Fixes since v1.6.5.4 -----
* Manual pages can be formatted with older xmlto again.
* GREP_OPTIONS exported from user's environment could have broken our scripted commands.
* In configuration files, a few variables that name paths can begin with ~/ and ~username/ and they are expanded as expected. This is not a bugfix but 1.6.6 will have this and without backporting users cannot easily use the same ~/.gitconfig across versions.
* "git diff -B -M" did the same computation to hash lines of contents twice, and held onto memory after it has used the data in it unnecessarily before it freed.
* "git diff -B" and "git diff --dirstat" was not counting newly added contents correctly.
* "git format-patch revisions... -- path" issued an incorrect error message that suggested to use "--" on the command line when path does not exist in the current work tree (it is a separate matter if it makes sense to limit format-patch with pathspecs like that without using the --full-diff option).
* "git grep -F -i StRiNg" did not work as expected.
* Enumeration of available merge strategies iterated over the list of commands in a wrong way, sometimes producing an incorrect result.
* "git shortlog" did not honor the "encoding" header embedded in the commit object like "git log" did.
* Reading progress messages that come from the remote side while running "git pull" is given precedence over reading the actual pack data to prevent garbled progress message on the user's terminal.
* "git rebase" got confused when the log message began with certain strings that looked like Subject:, Date: or From: header.
* "git reset" accidentally run in .git/ directory checked out the work tree contents in there. Downloads (~2,2 Mb)_ftp://ftp.kernel.org....6.5.5.tar.bz2
ЭЖД, 11.12.2009 - 22:56
git 1.6.5.6
Fixes since v1.6.5.5 -----
* "git add -p" had a regression since v1.6.5.3 that broke deletion of non-empty files.
* "git archive -o o.zip -- Makefile" produced an archive in o.zip but in POSIX tar format.
* Error message given to "git pull --rebase" when the user didn't give enough clue as to what branch to integrate with still talked about "merging with" the branch.
* Error messages given by "git merge" when the merge resulted in a fast-forward still were in plumbing lingo, even though in v1.6.5 we reworded messages in other cases.
* The post-upload-hook run by upload-pack in response to "git fetch" has been removed, due to security concerns (the hook first appeared in 1.6.5). Downloads (~2,2 Mb)_ftp://ftp.kernel.org....6.5.6.tar.bz2
ЭЖД, 17.12.2009 - 21:26
git 1.6.5.7
Fixes since v1.6.5.6 -----
* If a user specifies a color for a (i.e. a class of things to show in a particular color) that is known only by newer versions of git (e.g. "color.diff.func" was recently added for upcoming 1.6.6 release), an older version of git should just ignore them. Instead we diagnosed it as an error.
* With help.autocorrect set to non-zero value, the logic to guess typoes in the subcommand name misfired and ran a random nonsense command.
* If a command is run with an absolute path as a pathspec inside a bare repository, e.g. "rev-list HEAD -- /home", the code tried to run strlen() on NULL, which is the result of get_git_work_tree(), and segfaulted. Downloads (~2,2 Mb)_ftp://ftp.kernel.org....6.5.7.tar.bz2
ЭЖД, 9.01.2010 - 19:04
GIT 1.6.6
Из новшеств можно отметить:
обновление графических интерфейсов gitk и git-gui,
улучшение работы git-svn,
уменьшение потребления памяти при выполнении "git diff -B", реализована команда "git notes" для добавления аннотаций к уже совершенным коммитам,
теперь, из bisect можно возвращаться на произвольный коммит с помощью "git bisect reset";
в файлах конфигурации в некоторых путях допустимо указывать ~/ и ~username/,
улучшение юзабилити и оформления вывода в большом числе команд.
В новой версии также проведена подготовка к ожидаемому в следующей версии 1.7.0 частичному нарушению совместимости. При использованию конструкций, поведение которых планируется изменить в версии 1.7.0, git теперь выводит предупреждения, позволяя заблаговременно адаптироваться к будущим новшествам и подготовить к ним свои скрипты. В частности, скоро будет запрещено выполнение "git push" в ветках для которых была выполнена команда " Downloads (~2,2 Mb)_http://www.kernel.org...-1.6.6.tar.bz2
ЭЖД, 21.01.2010 - 19:54
git 1.6.6.1
Fixes since v1.6.6 --------
* "git blame" did not work well when commit lacked the author name.
* "git branch -a name" wasn't diagnosed as an error.
* "git count-objects" did not handle packfiles that are bigger than 4G on platforms with 32-bit off_t.
* "git checkout -m other" while on a branch that does not have any commit segfaulted, instead of failing.
* "git fast-import" choked when fed a tag that do not point at a commit.
* "git grep" finding from work tree files could have fed garbage to the underlying regexec(3).
* "git grep -L" didn't show empty files (they should never match, and they should always appear in -L output as unmatching).
* "git rebase -i" did not abort cleanly if it failed to launch the editor.
* "git reset --hard" did not work correctly when GIT_WORK_TREE environment variable is used to point at the root of the true work tree.
* http-backend was not listed in the command list in the documentation.
* Building on FreeBSD (both 7 and 8) needs OLD_ICONV set in the Makefile
* recursive merge didn't correctly diagnose its own programming errors, and instead caused the caller to segfault.
* The new "smart http" aware clients probed the web servers to see if they support smart http, but did not fall back to dumb http transport correctly with some servers.
* Time based reflog syntax e.g. "@{yesterday}" didn't diagnose a misspelled time specification and instead assumed "@{now}".
* "git archive HEAD -- no-such-directory" produced an empty archive without complaining.
* "git blame -L start,end -- file" misbehaved when given a start that is larger than the number of lines in the file.
* "git checkout -m" didn't correctly call custom merge backend supplied by the end user.
* "git config -f " misbehaved when run from a subdirectory.
* "git cvsserver" didn't like having regex metacharacters (e.g. '+') in CVSROOT environment.
* "git fast-import" did not correctly handle large blobs that may bust the pack size limit.
* "git gui" is supposed to work even when launched from inside a .git directory.
* "git gui" misbehaved when applying a hunk that ends with deletion.
* "git imap-send" did not honor imap.preformattedHTML as documented.
* "git log" family incorrectly showed the commit notes unconditionally by mistake, which was especially irritating when running "git log --oneline".
* "git status" shouldn't require an write access to the repository.
* In a freshly created repository "rev-parse HEAD^0" complained that it is dangling symref, even though "rev-parse HEAD" didn't.
* "git show :no-such-name" tried to access the index without bounds check, leading to a potential segfault.
* Message from "git cherry-pick" was harder to read and use than necessary when it stopped due to conflicting changes.
* We referred to ".git/refs/" throughout the documentation when we meant to talk about abstract notion of "ref namespace". Because people's repositories often have packed refs these days, this was confusing.
* "git diff --output=/path/that/cannot/be/written" did not correctly error out.
* "git grep -e -pattern-that-begin-with-dash paths..." could not be spelled as "git grep -- -pattern-that-begin-with-dash paths..." which would be a GNU way to use "--" as "end of options".
* "git grep" compiled with threading support tried to access an uninitialized mutex on boxes with a single CPU.
* "git stash pop -q --index" failed because the unnecessary --index option was propagated to "git stash drop" that is internally run at the end.
» Git v1.7.0 Release Notes «
=====
Notes on behaviour change -----
* "git push" into a branch that is currently checked out (i.e. pointed at by HEAD in a repository that is not bare) is refused by default.
Similarly, "git push $there :$killed" to delete the branch $killed in a remote repository $there, when $killed branch is the current branch pointed at by its HEAD, will be refused by default.
Setting the configuration variables receive.denyCurrentBranch and receive.denyDeleteCurrent to 'ignore' in the receiving repository can be used to override these safety features.
* "git send-email" does not make deep threads by default when sending a patch series with more than two messages. All messages will be sent as a reply to the first message, i.e. cover letter.
It has been possible already to configure send-email to send "shallow thread" by setting sendemail.chainreplyto configuration variable to false. The only thing this release does is to change the default when you haven't configured that variable.
* "git status" is not "git commit --dry-run" anymore. This change does not affect you if you run the command without argument.
* "git diff" traditionally treated various "ignore whitespace" options only as a way to filter the patch output. "git diff --exit-code -b" exited with non-zero status even if all changes were about changing the amount of whitespace and nothing else; and "git diff -b" showed the "diff --git" header line for such a change without patch text.
In this release, the "ignore whitespaces" options affect the semantics of the diff operation. A change that does not affect anything but whitespaces is reported with zero exit status when run with --exit-code, and there is no "diff --git" header for such a change.
* External diff and textconv helpers are now executed using the shell. This makes them consistent with other programs executed by git, and allows you to pass command-line parameters to the helpers. Any helper paths containing spaces or other metacharacters now need to be shell-quoted. The affected helpers are GIT_EXTERNAL_DIFF in the environment, and diff.*.command and diff.*.textconv in the config file.
* The --max-pack-size argument to 'git repack', 'git pack-objects', and 'git fast-import' was assuming the provided size to be expressed in MiB, unlike the corresponding config variable and other similar options accepting a size value. It is now expecting a size expressed in bytes, with a possible unit suffix of 'k', 'm', or 'g'.
Updates since v1.6.6 -----
(subsystems)
* "git fast-import" updates; adds "option" and "feature" to detect the mismatch between fast-import and the frontends that produce the input stream.
* "git svn" support of subversion "merge tickets" and miscellaneous fixes.
* Some more MSVC portability patches for msysgit port.
* Minimum Pthreads emulation for msysgit port.
(performance)
* More performance improvement patches for msysgit port.
(usability, bells and whistles)
* More commands learned "--quiet" and "--[no-]progress" options.
* Various commands given by the end user (e.g. diff.type.textconv, and GIT_EDITOR) can be specified with command line arguments. E.g. it is now possible to say "[diff "utf8doc"] textconv = nkf -w".
* "sparse checkout" feature allows only part of the work tree to be checked out.
* HTTP transfer can use authentication scheme other than basic (i.e./e.g. digest).
* Switching from a version of superproject that used to have a submodule to another version of superproject that no longer has it did not remove the submodule directory when it should (namely, when you are not interested in the submodule at all and didn't clone/checkout).
* A new attribute conflict-marker-size can be used to change the size of the conflict markers from the default 7; this is useful when tracked contents (e.g. git-merge documentation) have strings that resemble the conflict markers.
* A new syntax "@{upstream}" can be used on the command line to substitute the name of the "upstream" of the branch. Missing branch defaults to the current branch, so "git fetch && git merge @{upstream}" will be equivalent to "git pull".
* "git am --resolved" has a synonym "git am --continue".
* "git branch --set-upstream" can be used to update the (surprise!) upstream, i.e. where the branch is supposed to pull and merge from (or rebase onto).
* "git checkout A...B" is a way to detach HEAD at the merge base between A and B.
* "git checkout -m path" to reset the work tree file back into the conflicted state works even when you already ran "git add path" and resolved the conflicts.
* "git commit --date=''" can be used to override the author date just like "git commit --author=''" can be used to override the author identity.
* "git commit --no-status" can be used to omit the listing of the index and the work tree status in the editor used to prepare the log message.
* "git commit" warns a bit more aggressively until you configure user.email, whose default value almost always is not (and fundamentally cannot be) what you want.
* "git difftool" has been extended to make it easier to integrate it with gitk.
* "git fetch --all" can now be used in place of "git remote update".
* "git grep" does not rely on external grep anymore. It can use more than one thread to accelerate the operation.
* "git grep" learned "--quiet" option.
* "git log" and friends learned "--glob=heads/*" syntax that is a more flexible way to complement "--branches/--tags/--remotes".
* "git merge" learned to pass options specific to strategy-backends. E.g.
- "git merge -Xsubtree=path/to/directory" can be used to tell the subtree strategy how much to shift the trees explicitly.
- "git merge -Xtheirs" can be used to auto-merge as much as possible, while discarding your own changes and taking merged version in conflicted regions.
* "git push" learned "git push origin --delete branch", a syntactic sugar for "git push origin :branch".
* "git push" learned "git push --set-upstream origin forker:forkee" that lets you configure your "forker" branch to later pull from "forkee" branch at "origin".
* "git rebase --onto A...B" means the history is replayed on top of the merge base between A and B.
* "git rebase -i" learned new action "fixup" that squashes the change but does not affect existing log message.
* "git rebase -i" also learned --autosquash option that is useful together with the new "fixup" action.
* "git remote" learned set-url subcommand that updates (surprise!) url for an existing remote nickname.
* "git rerere" learned "forget path" subcommand. Together with "git checkout -m path" it will be useful when you recorded a wrong resolution.
* Use of "git reset --merge" has become easier when resetting away a conflicted mess left in the work tree.
* "git rerere" had rerere.autoupdate configuration but there was no way to countermand it from the command line; --no-rerere-autoupdate option given to "merge", "revert", etc. fixes this.
* "git status" learned "-s(hort)" output format.
(developers)
* The infrastructure to build foreign SCM interface has been updated.
* Many more commands are now built-in.
* THREADED_DELTA_SEARCH is no more. If you build with threads, delta compression will always take advantage of it.
Fixes since v1.6.6 --------
All of the fixes in v1.6.6.X maintenance series are included in this release, unless otherwise noted.
* "git branch -d branch" used to refuse deleting the branch even when the branch is fully merged to its upstream branch if it is not merged to the current branch. It now deletes it in such a case.
* "fiter-branch" command incorrectly said --prune-empty and --filter-commit were incompatible; the latter should be read as --commit-filter.
* When using "git status" or asking "git diff" to compare the work tree with something, they used to consider that a checked-out submodule with uncommitted changes is not modified; this could cause people to forget committing these changes in the submodule before committing in the superproject. They now consider such a change as a modification and "git diff" will append a "-dirty" to the work tree side when generating patch output or when used with the --submodule option.
* GIT_PAGER was not honored consistently by some scripted Porcelains, most notably "git am".
* updating working tree files after telling git to add them to the index and while it is still working created garbage object files in the repository without diagnosing it as an error.
* "git bisect -- pathspec..." did not diagnose an error condition properly when the simplification with given pathspec made the history empty.
* "git rev-list --cherry-pick A...B" now has an obvious optimization when the histories haven't diverged (i.e. when one end is an ancestor of the other).
* "git diff --quiet -w" did not work as expected.
* "git fast-import" didn't work with a large input, as it lacked support for producing the pack index in v2 format.
* "git imap-send" didn't use CRLF line endings over the imap protocol when storing its payload to the draft box, violating RFC 3501.
* "git log --format='%w(x,y,z)%b'" and friends that rewrap message has been optimized for utf-8 payload.
* Error messages generated on the receiving end did not come back to "git push".
* "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series to speed up scanning of large working tree.
Fixes since v1.7.0.2 ----- * Object files are created in a more ACL friendly way in repositories where group permission is ACL controlled. * "git add -i" didn't handle a deleted path very well. * "git blame" padded line numbers with one extra SP when the total number of lines was one less than multiple of ten due to an off-by-one error. * "git fetch --all/--multi" used to discard information for remotes that are fetched earlier. * "git log --author=me --grep=it" tried to find commits that have "it" or are written by "me", instead of the ones that have "it" _and_ are written by "me". * "git log -g branch" misbehaved when there was no entries in the reflog for the named branch. * "git mailinfo" (hence "git am") incorrectly removed initial indent from paragraphs. * "git prune" and "git reflog" (hence "git gc" as well) didn't honor an instruction never to expire by setting gc.reflogexpire to never. * "git push" misbehaved when branch..merge was configured without matching branch..remote. Downloads (~2,4 Mb)_ftp://ftp.kernel.org....7.0.3.tar.bz2
ЭЖД, 1.04.2010 - 19:17
git 1.7.0.4
Fixes since v1.7.0.3 -----
* Optimized ntohl/htonl on big-endian machines were broken.
* Color values given to "color.." configuration can now have more than one attributes (e.g. "bold ul").
* "git add -u nonexistent-path" did not complain.
* "git apply --whitespace=fix" didn't work well when an early patch in a patch series adds trailing blank lines and a later one depended on such a block of blank lines at the end.
* "git fast-export" didn't check error status and stop when marks file cannot be opened.
* "git format-patch --ignore-if-in-upstream" gave unwarranted errors when the range was empty, instead of silently finishing.
* "git daemon" failed to compile on platforms without sockaddr_storage type.
* Output from "git rev-list --pretty=oneline" was unparsable when a commit did not have any message, which is abnormal but possible in a repository converted from foreign scm.
* "git stash show " gave an error message that was not so useful. Reworded the message to " is not a stash".
* Python scripts in contrib/ area now start with "#!/usr/bin/env python" to honor user's PATH.
* "git imap-send" used to mistake any line that begins with "From " as a message separator in format-patch output.
* Smart http server backend failed to report an internal server error and infinitely looped instead after output pipe was closed. Downloads (~2,3 Mb)_ftp://ftp.kernel.org....7.0.5.tar.bz2
ЭЖД, 23.04.2010 - 17:20
git 1.7.0.6
Fixes since v1.7.0.5 -----
* "git diff --stat" used "int" to count the size of differences, which could result in overflowing.
* "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike newer tools in the git toolset.
* Authentication over http transport can now be made lazily, in that the request can first go to a URL without username, get a 401 response and then the client will ask for the username to use.
* We used to mistakenly think "../work" is a subdirectory of the current directory when we are in "../work-xyz".
* The attribute mechanism now allows an entry that uses an attribute macro that set/unset one attribute, immediately followed by an overriding setting; this makes attribute macros much easier to use.
* We didn't recognize timezone "Z" as a synonym for "UTC" (75b37e70).
* In 1.7.0, read-tree and user commands that use the mechanism such as checkout and merge were fixed to handle switching between branches one of which has a file while the other has a directory at the same path correctly even when there are some "confusing" pathnames in them. But the algorithm used for this fix was suboptimal and had a terrible performance degradation especially in larger trees.
* "git am -3" did not show diagnosis when the patch in the message was corrupt.
* After "git apply --whitespace=fix" removed trailing blank lines in an patch in a patch series, it failed to apply later patches that depend on the presence of such blank lines.
* "git bundle --stdin" segfaulted.
* "git checkout" and "git rebase" overwrote paths that are marked "assume unchanged".
* "git commit --amend" on a commit with an invalid author-name line that lacks the display name didn't work.
* "git describe" did not tie-break tags that point at the same commit correctly; newer ones are preferred by paying attention to the tagger date now.
* "git diff" used to tell underlying xdiff machinery to work very hard to minimize the output, but this often was spending too many extra cycles for very little gain.
* "git diff --color" did not paint extended diff headers per line (i.e. the coloring escape sequence didn't end at the end of line), which confused "less -R".
* "git fetch" over HTTP verifies the downloaded packfiles more robustly.
* The memory usage by "git index-pack" (run during "git fetch" and "git push") got leaner.
* "GIT_DIR=foo.git git init --bare bar.git" created foo.git instead of bar.git.
* "git merge --log" used to replace the custom message given by "-m" with the shortlog, instead of appending to it.
* "git notes copy" without any other argument segfaulted.
* "git pull" accepted "--dry-run", gave it to underlying "git fetch" but ignored the option itself, resulting in a bogus attempt to merge unrelated commit.
* "git rebase" did not faithfully reproduce a malformed author ident, that is often seen in a repository converted from foreign SCMs.
* "git reset --hard" started from a wrong directory and a working tree in a nonstandard location is in use got confused.
* "git send-email" lacked a way to specify the domainname used in the EHLO/HELO exchange, causing rejected connection from picky servers. It learned --smtp-domain option to solve this issue.
* "git send-email" did not declare a content-transfer-encoding and content-type even when its payload needs to be sent in 8-bit.
* "git show -C -C" and other corner cases lost diff metainfo output in 1.7.0.
* "git stash" incorrectly lost paths in the working tree that were previously removed from the index.
* "git status" stopped refreshing the index by mistake in 1.7.1.
* core.eol configuration and text/eol attributes are the new way to control the end of line conventions for files in the working tree.
* core.autocrlf has been made safer - it will now only handle line endings for new files and files that are LF-only in the repository. To normalize content that has been checked in with CRLF, use the new eol/text attributes.
* The whitespace rules used in "git apply --whitespace" and "git diff" gained a new member in the family (tab-in-indent) to help projects with policy to indent only with spaces.
* When working from a subdirectory, by default, git does not look for its metadirectory ".git" across filesystems, primarily to help people who have invocations of git in their custom PS1 prompts, as being outside of a git repository would look for ".git" all the way up to the root directory, and NFS mounts are often slow. DISCOVERY_ACROSS_FILESYSTEM environment variable can be used to tell git not to stop at a filesystem boundary.
* Usage help messages generated by parse-options library (i.e. most of the Porcelain commands) are sent to the standard output now.
* ':/' notation to look for a commit now takes regular expression and it is not anchored at the beginning of the commit log message anymore (this is a backward incompatible change).
* "git" wrapper learned "-c name=value" option to override configuration variable from the command line.
* Improved portability for various platforms including older SunOS, HP-UX 10/11, AIX, Tru64, etc. and platforms with Python 2.4.
* The message from "git am -3" has been improved when conflict resolution ended up making the patch a no-op.
* "git blame" applies the textconv filter to the contents it works on, when available.
* "git checkout --orphan newbranch" is similar to "-b newbranch" but prepares to create a root commit that is not connected to any existing commit.
* "git cherry-pick" learned to pick a range of commits (e.g. "cherry-pick A..B" and "cherry-pick --stdin"), so did "git revert"; these do not support the nicer sequencing control "rebase [-i]" has, though.
* "git cherry-pick" and "git revert" learned --strategy option to specify the merge strategy to be used when performing three-way merges.
* "git cvsserver" can be told to use pserver; its password file can be stored outside the repository.
* The output from the textconv filter used by "git diff" can be cached to speed up their reuse.
* "git diff --word-diff=" extends the existing "--color-words" option, making it more useful in color-challenged environments.
* The regexp to detect function headers used by "git diff" for PHP has been enhanced for visibility modifiers (public, protected, etc.) to better support PHP5.
* "diff.noprefix" configuration variable can be used to implicitly ask for "diff --no-prefix" behaviour.
* "git for-each-ref" learned "%(objectname:short)" that gives the object name abbreviated.
* "git format-patch" learned --signature option and format.signature configuration variable to customize the e-mail signature used in the output.
* Various options to "git grep" (e.g. --count, --name-only) work better with binary files.
* "git grep" learned "-Ovi" to open the files with hits in your editor.
* "git help -w" learned "chrome" and "chromium" browsers.
* "git log --decorate" shows commit decorations in various colours.
* "git log --follow " follows across copies (it used to only follow renames). This may make the processing more expensive.
* "git log --pretty=format:" specifier learned "% " magic that inserts a space only when % expands to a non-empty string; this is similar to "%+" magic, but is useful in a context to generate a single line output.
* "git notes prune" learned "-n" (dry-run) and "-v" options, similar to what "git prune" has.
* "git patch-id" can be fed a mbox without getting confused by the signature line in the format-patch output.
* "git remote" learned "set-branches" subcommand.
* "git rev-list A..B" learned --ancestry-path option to further limit the result to the commits that are on the ancestry chain between A and B (i.e. commits that are not descendants of A are excluded).
* "git show -5" is equivalent to "git show --do-walk 5"; this is similar to the update to make "git show master..next" walk the history, introduced in 1.6.4.
* "git status [-s] --ignored" can be used to list ignored paths.
* "git status -s -b" shows the current branch in the output.
* Various "gitweb" enhancements and clean-ups, including syntax highlighting, "plackup" support for instaweb, .fcgi suffix to run it as FastCGI script, etc.
* The test harness has been updated to produce TAP-friendly output.
* "git instaweb" wasn't useful when your Apache was installed under a name other than apache2 (e.g. "httpd").
* Similarly, "git web--browse" (invoked by "git help -w") learned that chrome browser is sometimes called google-chrome.
* An overlong line after ".gitdir: " in a git file caused out of bounds access to an array on the stack.
* "git config --path conf.var" to attempt to expand a variable conf.var that uses "~/" short-hand segfaulted when $HOME environment variable was not set.
* Documentation on Cygwin failed to build.
* The error message from "git pull blarg" when 'blarg' is an unknown remote name has been improved. Downloads (~2,3 Mb)_ftp://ftp.kernel.org....7.2.1.tar.bz2
ЭЖД, 22.08.2010 - 13:33
git 1.7.2.2
Fixes since v1.7.2.1 -----
* Object transfer over smart http transport deadlocked the client when the remote HTTP server returned a failure, instead of erroring it out.
* git-gui honors custom textconv filters when showing diff and blame;
* git diff --relative=subdir (without the necessary trailing /) did not work well;
* "git diff-files -p --submodule" was recently broken;
* "git checkout -b n ':/token'" did not work;
* "git index-pack" (hence "git fetch/clone/pull/push") enabled the object replacement machinery by mistake (it never should have); Downloads (~2,5 Mb)_ftp://ftp.kernel.org....7.2.2.tar.bz2
ЭЖД, 20.09.2010 - 17:32
git 1.7.2.3
* When people try insane things such as delta-compressing 4GiB files, we threw an assertion failure.
* "git archive" gave the full commit ID for "$Format:%h$".
* "git fetch --tags" did not fetch tags when remote..tagopt was set to --no-tags. The command line option now overrides the configuration setting.
* "git for-each-ref --format='%(objectname:short)'" has been completely broken for a long time.
* "git gc" incorrectly pruned a rerere record that was created long time ago but still is actively and repeatedly used.
* "git log --follow -M -p" was seriously broken in 1.7.2, reporting assertion failure.
* Running "git log" with an incorrect option started pager nevertheless, forcing the user to dismiss it.
* "git rebase" did not work well when the user has diff.renames configuration variable set.
* An earlier (and rather old) fix to "git rebase" against a rebased upstream broke a more normal, non rebased upstream case rather badly, attempting to re-apply patches that are already accepted upstream.
* "git submodule sync" forgot to update the superproject's config file when submodule URL changed.
* "git stash show stash@{$n}" was accidentally broken in 1.7.3 ("git stash show" without any argument still worked, though).
* "git stash branch $branch stash@{$n}" was accidentally broken in 1.7.3 and started dropping the named stash even when branch creation failed. Updates since v1.7.2 -----
* git-gui, now at version 0.13.0, got various updates and a new maintainer, Pat Thoyts.
* Gitweb allows its configuration to change per each request; it used to read the configuration once upon startup.
* When git finds a corrupt object, it now reports the file that contains it.
* "git checkout -B " is a shorter way to say "git branch -f " followed by "git checkout ".
* When "git checkout" or "git merge" refuse to proceed in order to protect local modification to your working tree, they used to stop after showing just one path that might be lost. They now show all, in a format that is easier to read.
* "git clean" learned "-e" ("--exclude") option.
* Hunk headers produced for C# files by "git diff" and friends show more relevant context than before.
* diff.ignoresubmodules configuration variable can be used to squelch the differences in submodules reported when running commands (e.g. "diff", "status", etc.) at the superproject level.
* http.useragent configuration can be used to lie who you are to your restrictive firewall.
* "git rebase --strategy " learned "-X" option to pass extra options that are understood by the chosen merge strategy.
* "git rebase -i" learned "exec" that you can insert into the insn sheet to run a command between its steps.
* "git rebase" between branches that have many binary changes that do not conflict should be faster.
* "git rebase -i" peeks into rebase.autosquash configuration and acts as if you gave --autosquash from the command line. Downloads (~2,5 Mb)_http://kernel.org/pub....7.3.1.tar.bz2
ЭЖД, 24.10.2010 - 18:33
git 1.7.3.2
This is primarily to push out many documentation fixes accumulated since the 1.7.3.1 release. Downloads (~2,5 Mb)_ftp://ftp.kernel.org....7.3.2.tar.bz2
ЭЖД, 6.12.2010 - 21:36
Git 1.7.3.3
Fixes since v1.7.3.2 -----
* "git apply" segfaulted when a bogus input is fed to it.
* Running "git cherry-pick --ff" on a root commit segfaulted.
* "diff", "blame" and friends incorrectly applied textconv filters to symlinks.
* Highlighting of whitespace breakage in "diff" output was showing incorrect amount of whitespaces when blank-at-eol is set and the line consisted only of whitespaces and a TAB.
* "diff" was overly inefficient when trying to find the line to use for the function header (i.e. equivalent to --show-c-function of GNU diff).
* "git imap-send" depends on libcrypto but our build rule relied on the linker to implicitly link it via libssl, which was wrong.
* "git merge-file" can be called from within a subdirectory now.
* "git repack -f" expanded and recompressed non-delta objects in the existing pack, which was wasteful. Use new "-F" option if you really want to (e.g. when changing the pack.compression level).
* "git rev-list --format="...%x00..." incorrectly chopped its output at NUL.
* "git send-email" did not correctly remove duplicate mail addresses from the Cc: header that appear on the To: header.
* The completion script (in contrib/completion) ignored lightweight tags in __git_ps1().
* "git-blame" mode (in contrib/emacs) didn't say (require 'format-spec) even though it depends on it; it didn't work with Emacs 22 or older unless Gnus is used.
* Smart HTTP transport used to incorrectly retry redirected POST request with GET request.
* "git apply" did not correctly handle patches that only change modes if told to apply while stripping leading paths with -p option.
* "git apply" can deal with patches with timezone formatted with a colon between the hours and minutes part (e.g. "-08:00" instead of "-0800").
* "git checkout" removed an untracked file "foo" from the working tree when switching to a branch that contains a tracked path "foo/bar". Prevent this, just like the case where the conflicting path were "foo" (c752e7f..7980872d).
* "git cherry-pick" or "git revert" refused to work when a path that would be modified by the operation was stat-dirty without a real difference in the contents of the file.
* "git diff --check" reported an incorrect line number for added blank lines at the end of file.
* "git imap-send" failed to build under NO_OPENSSL.
* Setting log.decorate configuration variable to "0" or "1" to mean "false" or "true" did not work.
* "git push" over dumb HTTP protocol did not work against WebDAV servers that did not terminate a collection name with a slash.
* "git tag -v" did not work with GPG signatures in rfc1991 mode.
* The post-receive-email sample hook was accidentally broken in 1.7.3.3 update.
* "gitweb" can sometimes be tricked into parrotting a filename argument given in a request without properly quoting. Downloads (~2,5 Mb)_ftp://ftp.kernel.org....7.3.4.tar.bz2
ЭЖД, 8.01.2011 - 10:37
git 1.7.3.5
Git 1.7.3.5 Release Notes ======
* The xfuncname pattern used by "git diff" and "git grep" to show the last notable line in context were broken for python and ruby for a long time.
* "git merge" into an unborn branch removed an untracked file "foo" from the working tree when merged branch had "foo" (this fix was already in 1.7.3.3 but was omitted from the release notes by mistake).
* "git status -s" did not quote unprintable characters in paths as documented.
* "git am --abort" used to always reset to the commit at the beginning of the last "am" invocation that has stopped, losing any unrelated commits that may have been made since then. Now it refrains from doing so and instead issues a warning.
* "git blame" incorrectly reused bogusly cached result of textconv filter for files from the working tree.
* "git commit" used to abort after the user edited the log message when the committer information was not correctly set up. It now aborts before starting the editor.
* "git commit --date=invalid" used to silently ignore the incorrectly specified date; it is now diagnosed as an error.
* "git rebase --skip" to skip the last commit in a series used to fail to run post-rewrite hook and to copy notes from old commits that have successfully been rebased so far. Now it do (backmerge ef88ad2).
Скрипт автодополнения bash теперь поддерживает автодополнение симметричных различий (symmetric difference) для команды "git diff" (например: "git diff ...bra{TAB}"); Минимальная длина сокращенных и уникальных имен объектов теперь может быть задана через переменную core.abbrev; Команда "git apply -v" теперь сообщает о смещенных строках если патч накладывается не точно; "git repo-config" объявлена устаревшей. Вместо нее следует использовать "git config"; "git checkout --detach {commit}" теперь можно использовать в качестве синонима "git checkout {commit}^0". Команда "git checkout", примененная в отношении "detached HEAD", теперь выдает на экран предупреждение; "git cherry-pick" и "git revert" теперь могут использовать произвольную стратегию слияния, на манер "git rebase"; "git cherry-pick" теперь запоминает коммиты, которые не были применены из-за конфликтов, так что теперь не обязательно использовать команду "commit -c $commit"; "git cvsimport" завершается немедленно если сервер CVS оказывается недоступен, без печати сообщений об ошибках; "git fetch" и "git upload-pack" теперь понимают расширение протокола 'no-done', которое позволяет избежать дополнительного обмена пакетами после того как операция "сontent negotiation" будет завершена; "git fetch" теперь умеет рекурсивно загружать суб-модули в автоматическом режиме; "git grep -f {filename}" теперь умеет читать из стандартного потока ввода (символ "-" вместо имени файла); "git init" теперь понимает опцию "--separate-git-dir", которая позволяет создать каталог репозитория в другом месте и подключить его используя механизм gitdir; Команды типа "git log" понимают шаблоны (например: "git log -- '*.txt'"), а также опции "--cherry" и "--cherry-mark", которые могут быть использованы для просмотра двух расходящихся ("diverged") веток без подсветки одинаковых изменений; "git mergetool" обучен работе с программой "beyond compare 3"; Теперь команду "git rerere forget" можно вызывать только со спецификатором пути; "git rev-list --objects $revs -- $pathspec" выводит на экран ограниченное число объектов; Команда "git push", вызванная без параметров, выдает более информативное сообщение если в качестве значения опции push.default установлено "tracking" или не указан удаленный репозиторий; У значения "tracking" опции "push.default" теперь есть более информативный синоним: "upstream"; У команды "git rerere" появилась новая под-команда "remaining", которая похожа на "status", за исключением того, что не выводит на экран пути, которые уже помечены как "resolved". Команда "git mergetool" уже использует ее. Downloads (~2,6 Mb)_http://www.kernel.org...-1.7.5.tar.bz2