diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-21 16:32:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-21 16:33:20 -0700 |
| commit | 8fbf879ed75b67417b0e36eb7b03b79611f1f8a0 (patch) | |
| tree | 268336d6e6f2d068cb4f24ffc88d15490c8f68fe /Documentation | |
| parent | 3a0483281afbb6660aaf86c7b228a523782a4d6a (diff) | |
| download | git-8fbf879ed75b67417b0e36eb7b03b79611f1f8a0.tar.gz git-8fbf879ed75b67417b0e36eb7b03b79611f1f8a0.tar.xz | |
Revert "stat_tracking_info(): only count real commits"
This reverts commit 19de5d6913b9681d2bde533bccc8445c9236a648.
It produces a misleading output to decide if a merge can fast-forward.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.6.3.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt index b53e7b86e..efce29ddf 100644 --- a/Documentation/RelNotes-1.6.3.txt +++ b/Documentation/RelNotes-1.6.3.txt @@ -69,10 +69,6 @@ Updates since v1.6.2 with the 'edit' action in git-add -i/-p, you can abort the editor to tell git not to apply it. -* The number of commits shown in "you are ahead/behind your upstream" - messages given by "git checkout" and "git status" used to count merge - commits; now it doesn't. - * @{-1} is a new way to refer to the last branch you were on introduced in 1.6.2, but the initial implementation did not teach this to a few commands. Now the syntax works with "branch -m @{-1} newname". |