diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:27:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:27:30 -0700 |
| commit | c9321a0e20f3461cf4ae07a8320aa80480107f24 (patch) | |
| tree | 9f8003bd492baaff2eadd7fa0a1e441cdea43a8c /builtin/commit.c | |
| parent | 36bad9dee0a729f6205ceba3b059139162e01ab5 (diff) | |
| parent | 99694544358b74c14982f2b9769f8804f017672c (diff) | |
| download | git-c9321a0e20f3461cf4ae07a8320aa80480107f24.tar.gz | |
Merge branch 'jc/maint-combined-diff-work-tree' into maint
* jc/maint-combined-diff-work-tree:
diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
Conflicts:
combine-diff.c
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions