diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-06 12:18:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-06 12:18:47 -0700 |
| commit | 2fc0c022e60f54be55d6065b9a8abccdc0f67bab (patch) | |
| tree | d3d9bf5d28501b57fd4130c05f9da212c0784936 /builtin/commit.c | |
| parent | Merge branch 'fc/show-branch-in-rebase-am' (diff) | |
| parent | difftool --dir-diff: allow changing any clean working tree file (diff) | |
| download | tgif-2fc0c022e60f54be55d6065b9a8abccdc0f67bab.tar.xz | |
Merge branch 'ks/difftool-dir-diff-copy-fix'
"difftool --dir-diff" did not copy back changes made by the
end-user in the diff tool backend to the working tree in some
cases.
* ks/difftool-dir-diff-copy-fix:
difftool --dir-diff: allow changing any clean working tree file
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions