diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-30 13:25:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-30 13:25:27 -0700 |
| commit | b19293df9e84ed056bc984aa7ef716689b58b0b1 (patch) | |
| tree | 4c7eeda9e1f66f31cd30a89c48848195cdd4517e /builtin-merge-ours.c | |
| parent | Merge branch 'maint-1.6.1' into maint (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-b19293df9e84ed056bc984aa7ef716689b58b0b1.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
Fix bash completion in path with spaces
bash completion: only show 'log --merge' if merging
git-tag(1): add hint about commit messages
Documentation: update graph api example.
Conflicts:
contrib/completion/git-completion.bash
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions