![[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) |
* 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
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
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
| Documentation/git-commit.txt | patch | | diff1 | | diff2 | | blob | history |
| builtin/add.c | patch | | diff1 | | diff2 | | blob | history |
| commit.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/config.txt
Simple merge
diff --cc Documentation/git-commit.txt
index 6e4c220f205a8f4dd29527acf7b637c0e855239b,ec7b577b85ae5a320b1006380f5abd03946ba44b..b586c0f442afd33c2875af26b83bb261de7361b0
--------
[verse]
'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
- [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
- [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
- [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
- [-i | -o] [--] [<file>...]
+ [(-c | -C | --fixup | --squash) <commit>] [-F <file> | -m <msg>]
+ [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify]
+ [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>]
- [--status | --no-status] [--] [[-i | -o ]<file>...]
++ [--status | --no-status] [-i | -o] [--] [<file>...]
DESCRIPTION
-----------
diff --cc builtin/add.c
Simple merge
diff --cc commit.c
Simple merge