summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-03-12 13:25:58 -0400
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-03-12 13:25:58 -0400
commit56a7fde16ed060bc4169cc78308f8cf10f1d92a8 (patch)
tree4b1c60bc81abde2d2d6723fe42f9d809ddaeb24f /Documentation/merge-options.txt
parentgit-gui: Allow committing empty merges (diff)
downloadtgif-56a7fde16ed060bc4169cc78308f8cf10f1d92a8.tar.xz
git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44. Too many users have complained about the credits generator in git-gui, so I'm backing the entire thing out. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions