undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with maint

Browse Source
This commit is contained in:
Junio C Hamano 2012-09-24 12:50:36 -07:00
commit b5d156c362
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Documentation/RelNotes/1.7.12.2.txt Normal file
View File

@ -0,0 +1,32 @@
Git 1.7.12.2 Release Notes
==========================
Fixes since v1.7.12.1
---------------------
* Even during a conflicted merge, "git blame $path" always meant to
blame uncommitted changes to the "working tree" version; make it
more useful by showing cleanly merged parts as coming from the other
branch that is being merged.
* "git blame MAKEFILE" run in a history that has "Makefile" but not
"MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
confused on a case insensitive filesystem and failed to do so.
* "git fetch --all", when passed "--no-tags", did not honor the
"--no-tags" option while fetching from individual remotes (the same
issue existed with "--tags", but combination "--all --tags" makes
much less sense than "--all --no-tags").
* "git log/diff/format-patch --stat" showed the "N line(s) added"
comment in user's locale and caused careless submitters to send
patches with such a line in them to projects whose project language
is not their language, mildly irritating others. Localization to
the line has been disabled for now.
* The subcommand to remove the definition of a remote in "git remote"
was named "rm" even though all other subcommands were spelled out.
Introduce "git remote remove" to remove confusion, and keep "rm" as
a backward compatible synonym.
Also contains a handful of documentation updates.

7
contrib/completion/git-prompt.sh
View File

@ -34,9 +34,10 @@
# #
# If you would like to see the difference between HEAD and its upstream, # If you would like to see the difference between HEAD and its upstream,
# set GIT_PS1_SHOWUPSTREAM="auto". A "<" indicates you are behind, ">" # set GIT_PS1_SHOWUPSTREAM="auto". A "<" indicates you are behind, ">"
# indicates you are ahead, and "<>" indicates you have diverged. You # indicates you are ahead, "<>" indicates you have diverged and "="
# can further control behaviour by setting GIT_PS1_SHOWUPSTREAM to a # indicates that there is no difference. You can further control
# space-separated list of values: # behaviour by setting GIT_PS1_SHOWUPSTREAM to a space-separated list
# of values:
# #
# verbose show number of commits ahead/behind (+/-) upstream # verbose show number of commits ahead/behind (+/-) upstream
# legacy don't use the '--count' option available in recent # legacy don't use the '--count' option available in recent