diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:21:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:21:45 -0800 |
| commit | c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf (patch) | |
| tree | ffa6c4e6fd861ac3c77cbc5ff3f621f3e5f9c3f9 /builtin-cat-file.c | |
| parent | Merge branch 'np/auto-thread' (diff) | |
| parent | Document "git-reset --merge" (diff) | |
| download | tgif-c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf.tar.xz | |
Merge branch 'lt/reset-merge'
* lt/reset-merge:
Document "git-reset --merge"
Add 'merge' mode to 'git reset'
Diffstat (limited to 'builtin-cat-file.c')
0 files changed, 0 insertions, 0 deletions