author | Junio C Hamano <gitster@pobox.com> | |
Thu, 2 Dec 2010 00:41:13 +0000 (16:41 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 2 Dec 2010 00:41:13 +0000 (16:41 -0800) | ||
commit | 94fdb6f6ebcfe2842e8648dd88389e2e850723e9 | |
tree | 62d85d3339367019cb23c3c6d99e6aae0e8c6945 | tree | snapshot |
parent | df5d43be1f721b0ede37097b815463ceb43b0449 | commit | diff |
parent | 5501bf854ce6a3847ef0de6f6aa63f6b93e82b67 | commit | diff |
Merge branch 'maint'
* maint:
add: introduce add.ignoreerrors synonym for add.ignore-errors
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
* maint:
add: introduce add.ignoreerrors synonym for add.ignore-errors
bash: Match lightweight tags in prompt
git-commit.txt: (synopsis): move -i and -o before "--"
Documentation/config.txt | diff1 | | diff2 | | blob | history |
builtin/add.c | diff1 | | diff2 | | blob | history |
contrib/completion/git-completion.bash | diff1 | | diff2 | | blob | history |