![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 22:26:40 +0000 (15:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 22:26:40 +0000 (15:26 -0700) | ||
| commit | 92b87a9bab1a84261d2381e813e58577967bdc79 | |
| tree | ecb790bc0bbc983a23bf4203af0ece76f0a93a17 | tree | snapshot |
| parent | c8e22eafddf21ba05d050f7856922fdf5ffc35da | commit | diff |
| parent | 9855b08d35edf8a8a441f24ff7b00e220a29f261 | commit | diff |
Merge branch 'master' into next
* master:
Start 1.7.4 cycle
MinGW: avoid collisions between "tags" and "TAGS"
diff: trivial fix for --output file error message
user-manual: fix anchor name Finding-comments-With-given-Content
user-manual: be consistent in illustrations to 'git rebase'
stash: simplify parsing fixes
Git 1.7.3.1
stash: fix git stash branch regression when branch creation fails
stash drops the stash even if creating the branch fails because it already exists
* master:
Start 1.7.4 cycle
MinGW: avoid collisions between "tags" and "TAGS"
diff: trivial fix for --output file error message
user-manual: fix anchor name Finding-comments-With-given-Content
user-manual: be consistent in illustrations to 'git rebase'
stash: simplify parsing fixes
Git 1.7.3.1
stash: fix git stash branch regression when branch creation fails
stash drops the stash even if creating the branch fails because it already exists
| Makefile | diff1 | | diff2 | | blob | history |