summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorLibravatar Leif Middelschulte <Leif.Middelschulte@gmail.com>2018-06-11 19:31:28 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-11 11:03:55 -0700
commit40aac22b43c8f9c4cc3acf625fdec3a24368ed4c (patch)
treea030bbc81514b0a67ebffb302bf1c4f7de345e06 /git-gui/lib/merge.tcl
parentmerge-recursive: give notice when submodule commit gets fast-forwarded (diff)
downloadtgif-40aac22b43c8f9c4cc3acf625fdec3a24368ed4c.tar.xz
merge-submodule: reduce output verbosity
The output shall behave more similar to ordinary file merges' output to provide a more consistent user experience. Signed-off-by: Leif Middelschulte <Leif.Middelschulte@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions