diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-30 00:44:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-30 00:44:19 -0700 |
| commit | 66037991d3fd2ac7e699c7bd21d939b9e397f6a4 (patch) | |
| tree | 1de603939614374c990c78cb15620f10b8e83c52 /merge-file.c | |
| parent | f9d800e2074a60a009e7c670e396a379d8c46cc5 (diff) | |
| parent | a0d2ceb2769731571cdd195582bfedf90225e712 (diff) | |
| download | git-66037991d3fd2ac7e699c7bd21d939b9e397f6a4.tar.gz | |
Merge branch 'maint'
* maint:
doc/rev-parse: clarify reflog vs --until for specifying revisions
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions