tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
git-gui: use themed tk widgets with Tk 8.5
[git.git]
/
lib
/
merge.tcl
2010-01-28
Pat Thoyts
git-gui: use themed tk widgets with Tk 8.5
blob
|
commitdiff
|
raw
2008-10-10
Johannes Sixt
git-gui: Fix switch statement in lib/merge.tcl
blob
|
commitdiff
|
raw
|
diff to current
2008-09-30
Alexander Gavrilov
git-gui: Make Ctrl-T safe to use for conflicting files.
blob
|
commitdiff
|
raw
|
diff to current
2008-07-13
Johannes Schindelin
git-gui: MERGE_RR lives in .git/ directly with newer...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-05
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-28
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-22
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-20
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-12
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-04
Christian Stimming
git-gui: (i18n) Fix a bunch of still untranslated strings.
blob
|
commitdiff
|
raw
|
diff to current
2007-10-23
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-10-03
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-22
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-20
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-17
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-14
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-13
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-11
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-09
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-04
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-09-02
Christian Stimming
Mark strings for translation.
blob
|
commitdiff
|
raw
|
diff to current
2007-08-20
Shawn O. Pearce
git-gui: Allow git-merge to use branch names in conflic...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-30
Shawn O. Pearce
git-gui: Minor refactoring of merge command line in...
gitgui-0.8.0
blob
|
commitdiff
|
raw
|
diff to current
2007-07-29
Shawn O. Pearce
git-gui: Use progress bar while resetting/aborting...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-29
Christian Stimming
git-gui: Unify wording to say "to stage" instead of...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-25
Shawn O. Pearce
git-gui: Remove usernames from absolute SSH urls during...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-25
Shawn O. Pearce
git-gui: Format tracking branch merges as though they...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-25
Shawn O. Pearce
git-gui: Cleanup bindings within merge dialog
blob
|
commitdiff
|
raw
|
diff to current
2007-07-25
Shawn O. Pearce
git-gui: Replace merge dialog with our revision picker...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-19
Shawn O. Pearce
git-gui: Completely remove support for creating octopus...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-18
Shawn O. Pearce
git-gui: Convert merge dialog to use class system
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-09
Shawn O. Pearce
git-gui: Always use absolute path to all git executables
blob
|
commitdiff
|
raw
|
diff to current
2007-07-09
Shawn O. Pearce
git-gui: Refactor our ui_status_value update technique
blob
|
commitdiff
|
raw
|
diff to current
2007-07-04
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-04
Shawn O. Pearce
git-gui: Unlock the index when cancelling merge dialog
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-06-12
Shawn O. Pearce
git-gui: Save geometry before the window layout is...
blob
|
commitdiff
|
raw
|
diff to current
2007-05-09
Shawn O. Pearce
git-gui: Convert browser, console to "class" format
blob
|
commitdiff
|
raw
|
diff to current
2007-05-09
Shawn O. Pearce
git-gui: Allow shift-{k,j} to select a range of branche...
blob
|
commitdiff
|
raw
|
diff to current
2007-05-08
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-05-08
Shawn O. Pearce
git-gui: Use vi-like keys in merge dialog
gitgui-0.7.0-rc1
blob
|
commitdiff
|
raw
|
diff to current
2007-05-08
Shawn O. Pearce
git-gui: Include commit id/subject in merge choices
blob
|
commitdiff
|
raw
|
diff to current
2007-05-08
Shawn O. Pearce
git-gui: Show all possible branches for merge
blob
|
commitdiff
|
raw
|
diff to current
2007-05-08
Shawn O. Pearce
git-gui: Move merge support into a namespace
blob
|
commitdiff
|
raw
|
diff to current
2007-05-08
Shawn O. Pearce
git-gui: Move console procs into their own namespace
blob
|
commitdiff
|
raw
|
diff to current
2007-05-08
Shawn O. Pearce
git-gui: Refactor into multiple files to save my sanity
blob
|
commitdiff
|
raw
|
diff to current
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
