mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 14:57:52 +01:00
Code Activity
Mirror of https://github.com/git/git
347 commits 6 branches 956 tags 474 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
Find a file
Shawn O. Pearce 1afd1ec107 git-gui: Warn users before making an octopus merge 
A coworker who was new to git-gui recently tried to make an octopus
merge when he did not quite mean to.  Unfortunately in his case the
branches had file level conflicts and failed to merge with the octopus
strategy, and he didn't quite know why this happened.  Since most users
really don't want to perform an octopus merge this additional safety
valve in front of the merge process is a good thing.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-05-02 13:06:09 -04:00
.gitignore git-gui: Revert "git-gui: Display all authors of git-gui." 2007-03-12 13:26:04 -04:00
git-gui.sh git-gui: Warn users before making an octopus merge 2007-05-02 13:06:09 -04:00
GIT-VERSION-GEN git-gui: Prefer version file over git-describe. 2007-02-14 01:55:16 -05:00
Makefile git-gui: Honor TCLTK_PATH if supplied 2007-04-17 13:16:14 -04:00