diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:37:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:37:09 -0700 |
| commit | 809b2625433aef412a3e5b82729175309a35ba20 (patch) | |
| tree | 3998a946feef1069cd4c8006f0f20993802a345c /Documentation/git-merge-file.txt | |
| parent | doc: A few minor copy edits. (diff) | |
| parent | commit: document a couple of options (diff) | |
| download | tgif-809b2625433aef412a3e5b82729175309a35ba20.tar.xz | |
Merge branch 'rr/doc-commit' into maint
* rr/doc-commit:
commit: document a couple of options
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions