index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
lib
/
merge.tcl
Age
Commit message (
Expand
)
Author
2007-09-02
Mark strings for translation.
Christian Stimming
2007-08-20
git-gui: Allow git-merge to use branch names in conflict markers
Shawn O. Pearce
2007-07-30
git-gui: Minor refactoring of merge command line in merge support
gitgui-0.8.0
Shawn O. Pearce
2007-07-29
git-gui: Use progress bar while resetting/aborting files
Shawn O. Pearce
2007-07-29
git-gui: Unify wording to say "to stage" instead of "to add"
Christian Stimming
2007-07-25
git-gui: Remove usernames from absolute SSH urls during merging
Shawn O. Pearce
2007-07-25
git-gui: Format tracking branch merges as though they were pulls
Shawn O. Pearce
2007-07-25
git-gui: Cleanup bindings within merge dialog
Shawn O. Pearce
2007-07-25
git-gui: Replace merge dialog with our revision picker widget
Shawn O. Pearce
2007-07-19
git-gui: Completely remove support for creating octopus merges
Shawn O. Pearce
2007-07-18
git-gui: Convert merge dialog to use class system
Shawn O. Pearce
2007-07-09
git-gui: Always use absolute path to all git executables
Shawn O. Pearce
2007-07-09
git-gui: Refactor our ui_status_value update technique
Shawn O. Pearce
2007-07-04
git-gui: Unlock the index when cancelling merge dialog
Shawn O. Pearce
2007-06-12
git-gui: Save geometry before the window layout is damaged
Shawn O. Pearce
2007-05-09
git-gui: Convert browser, console to "class" format
Shawn O. Pearce
2007-05-09
git-gui: Allow shift-{k,j} to select a range of branches to merge
Shawn O. Pearce
2007-05-08
git-gui: Use vi-like keys in merge dialog
gitgui-0.7.0-rc1
Shawn O. Pearce
2007-05-08
git-gui: Include commit id/subject in merge choices
Shawn O. Pearce
2007-05-08
git-gui: Show all possible branches for merge
Shawn O. Pearce
2007-05-08
git-gui: Move merge support into a namespace
Shawn O. Pearce
2007-05-08
git-gui: Move console procs into their own namespace
Shawn O. Pearce
2007-05-08
git-gui: Refactor into multiple files to save my sanity
Shawn O. Pearce