Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
git-gui: remove .git/CHERRY_PICK_HEAD after committing
[gitweb.git]
/
lib
/
mergetool.tcl
2011-03-25
Merge branch 'ss/git-gui-mergetool'
gitgui-0.14.0
blob
|
diff
|
raw
2011-02-27
mergetool--lib: Add Beyond Compare 3 as a tool
blob
|
diff
|
raw
2011-02-27
mergetool--lib: Sort tools alphabetically for easier...
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-08
git-gui: Ensure consistent usage of mergetool.keepBackup
blob
|
diff
|
raw
|
diff to current
2009-03-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-03-20
git-gui: Fix merge conflict display error when filename...
blob
|
diff
|
raw
|
diff to current
2008-09-30
git-gui: Make Ctrl-T safe to use for conflicting files.
blob
|
diff
|
raw
|
diff to current
2008-09-30
git-gui: Do not automatically stage file after merge...
blob
|
diff
|
raw
|
diff to current
2008-09-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-09-24
git-gui: Reenable staging unmerged files by clicking...
blob
|
diff
|
raw
|
diff to current
2008-09-12
git-gui: I18n fix sentence parts into full sentences...
blob
|
diff
|
raw
|
diff to current
2008-09-12
git-gui: Restore ability to Stage Working Copy for...
blob
|
diff
|
raw
|
diff to current
2008-09-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-09-05
git-gui: Reimplement and enhance auto-selection of...
blob
|
diff
|
raw
|
diff to current
2008-09-05
git-gui: Support more merge tools.
blob
|
diff
|
raw
|
diff to current
2008-09-05
git-gui: Support calling merge tools.
blob
|
diff
|
raw
|
diff to current
2008-09-05
git-gui: Support resolving conflicts via the diff conte...
blob
|
diff
|
raw
|
diff to current