![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Dec 2010 00:42:22 +0000 (16:42 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Dec 2010 00:42:22 +0000 (16:42 -0800) | ||
| commit | 8b3da136101fd4d712ce67c2928913f99ef759c3 | |
| tree | 6fd5bdc326c5890732972c2f912a027d41b85a5c | tree | snapshot |
| parent | ba590acfe07112ef4a91cda49a375b358bbc945a | commit | diff |
| parent | 94fdb6f6ebcfe2842e8648dd88389e2e850723e9 | commit | diff |
Merge branch 'master' into next
* master:
add: introduce add.ignoreerrors synonym for add.ignore-errors
commit.c: Remove backward goto in read_craft_line()
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
Conflicts:
Documentation/git-commit.txt
* master:
add: introduce add.ignoreerrors synonym for add.ignore-errors
commit.c: Remove backward goto in read_craft_line()
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
Conflicts:
Documentation/git-commit.txt
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-commit.txt | diff1 | | diff2 | | blob | history |
| builtin/add.c | diff1 | | diff2 | | blob | history |
| commit.c | diff1 | | diff2 | | blob | history |