diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-24 17:54:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-24 17:54:08 -0800 |
| commit | 89919f4f57006358c278c1f207249edcccbe68c4 (patch) | |
| tree | 0216e61b7a06eade9c50c7a5b5bb59609baa12aa /Documentation/git-merge.txt | |
| parent | Fix sample pre-commit hook (diff) | |
| parent | git-commit: Add tests for invalid usage of -a/--interactive with paths (diff) | |
| download | tgif-89919f4f57006358c278c1f207249edcccbe68c4.tar.xz | |
Merge branch 'bs/maint-commit-options' into maint
* bs/maint-commit-options:
git-commit: Add tests for invalid usage of -a/--interactive with paths
git-commit.sh: Fix usage checks regarding paths given when they do not make sense
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions