tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Provide 'git merge --abort' as a synonym to 'git reset --merge'
[git.git]
/
git-gui
/
Makefile
2010-08-02
Junio C Hamano
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
commitdiff
|
raw
2010-07-26
Junio C Hamano
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
commitdiff
|
raw
2010-07-16
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
2010-07-15
Junio C Hamano
Merge branch 'jc/diff-merge-base-multi'
blob
|
commitdiff
|
raw
2010-07-09
Junio C Hamano
Merge remote branch 'ko/master' into jc/read-tree-cache...
blob
|
commitdiff
|
raw
2010-07-07
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
2010-06-16
Junio C Hamano
Merge branch 'jc/am-3-show-corrupted-patch' into maint
blob
|
commitdiff
|
raw
2010-06-16
Junio C Hamano
Merge branch 'hg/maint-attr-fix' into maint
blob
|
commitdiff
|
raw
2010-05-21
Junio C Hamano
Merge branch 'jn/gitweb-our-squelch'
blob
|
commitdiff
|
raw
2010-05-21
Junio C Hamano
Merge branch 'jc/am-3-show-corrupted-patch'
blob
|
commitdiff
|
raw
2010-05-21
Junio C Hamano
Merge branch 'jc/maint-no-reflog-expire-unreach-for...
blob
|
commitdiff
|
raw
2010-05-09
Junio C Hamano
Merge branch 'hg/maint-attr-fix'
blob
|
commitdiff
|
raw
2010-05-09
Junio C Hamano
Merge branch 'jc/maint-reflog-expire-unreachable'
blob
|
commitdiff
|
raw
2010-04-23
Junio C Hamano
Merge branch 'jk/maint-diffstat-overflow' into maint
blob
|
commitdiff
|
raw
2010-04-19
Junio C Hamano
Merge branch 'jk/maint-diffstat-overflow'
blob
|
commitdiff
|
raw
2010-04-19
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-04-11
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
blob
|
commitdiff
|
raw
2010-04-10
Junio C Hamano
Merge branch 'jc/conflict-marker-size' into maint
blob
|
commitdiff
|
raw
2010-04-10
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor' into...
blob
|
commitdiff
|
raw
2010-04-10
Junio C Hamano
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
blob
|
commitdiff
|
raw
2010-04-06
Junio C Hamano
Merge branch 'jc/conflict-marker-size'
blob
|
commitdiff
|
raw
2010-04-03
Junio C Hamano
Merge branch 'mg/maint-send-email-lazy-editor'
blob
|
commitdiff
|
raw
2010-03-31
Junio C Hamano
Merge branch 'jc/maint-refs-dangling' into maint
blob
|
commitdiff
|
raw
2010-03-29
Junio C Hamano
Merge branch 'sb/notes-parse-opt'
blob
|
commitdiff
|
raw
2010-03-29
Junio C Hamano
Merge branch 'cp/add-u-pathspec' into maint
blob
|
commitdiff
|
raw
2010-03-24
Junio C Hamano
Merge branch 'tr/notes-display'
blob
|
commitdiff
|
raw
2010-03-24
Junio C Hamano
Merge branch 'jc/maint-refs-dangling'
blob
|
commitdiff
|
raw
2010-03-24
Junio C Hamano
Merge branch 'jc/color-attrs' into maint
blob
|
commitdiff
|
raw
2010-03-24
Junio C Hamano
Merge branch 'jk/maint-add-ignored-dir' into maint
blob
|
commitdiff
|
raw
2010-03-20
Junio C Hamano
Merge branch 'jk/maint-add-ignored-dir'
blob
|
commitdiff
|
raw
2010-03-20
Junio C Hamano
Merge branch 'jc/color-attrs'
blob
|
commitdiff
|
raw
2010-03-15
Junio C Hamano
Merge branch 'jh/notes'
blob
|
commitdiff
|
raw
2010-03-10
Junio C Hamano
Merge branch 'cp/add-u-pathspec'
blob
|
commitdiff
|
raw
2010-03-08
Junio C Hamano
Merge branch 'fn/maint-mkdtemp-compat' into maint
blob
|
commitdiff
|
raw
2010-03-08
Junio C Hamano
Merge branch 'jk/maint-push-tracking-wo-remote' into...
blob
|
commitdiff
|
raw
2010-03-08
Junio C Hamano
Merge branch 'jk/maint-add--interactive-delete' into...
blob
|
commitdiff
|
raw
2010-03-08
Junio C Hamano
Merge branch 'jc/grep-author-all-match-implicit' into...
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'rs/optim-text-wrap' into maint-1.6.6
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list' into maint...
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'cc/maint-bisect-paths' into maint-1.6.6
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'fn/maint-mkdtemp-compat'
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-push-tracking-wo-remote'
blob
|
commitdiff
|
raw
2010-03-07
Junio C Hamano
Merge branch 'jk/maint-add--interactive-delete'
blob
|
commitdiff
|
raw
2010-03-05
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list' into maint
blob
|
commitdiff
|
raw
2010-03-05
Junio C Hamano
Merge branch 'rs/optim-text-wrap' into maint
blob
|
commitdiff
|
raw
2010-03-05
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
blob
|
commitdiff
|
raw
2010-03-05
Junio C Hamano
Merge branch 'cc/maint-bisect-paths' into maint
blob
|
commitdiff
|
raw
2010-03-05
Junio C Hamano
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
commitdiff
|
raw
2010-03-03
Junio C Hamano
Merge branch 'hm/maint-imap-send-crlf' into maint
blob
|
commitdiff
|
raw
2010-03-03
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm' into maint
blob
|
commitdiff
|
raw
2010-03-02
Junio C Hamano
Merge branch 'tr/maint-cherry-pick-list'
blob
|
commitdiff
|
raw
2010-03-02
Junio C Hamano
Merge branch 'rs/optim-text-wrap'
blob
|
commitdiff
|
raw
2010-03-02
Junio C Hamano
Merge branch 'gf/maint-sh-setup-nongit-ok'
blob
|
commitdiff
|
raw
2010-03-02
Junio C Hamano
Merge branch 'jc/grep-author-all-match-implicit'
blob
|
commitdiff
|
raw
2010-03-01
Junio C Hamano
Merge branch 'cc/maint-bisect-paths'
blob
|
commitdiff
|
raw
2010-02-21
Junio C Hamano
Merge branch 'hm/maint-imap-send-crlf'
blob
|
commitdiff
|
raw
2010-02-21
Junio C Hamano
Merge branch 'jc/maint-fix-test-perm'
blob
|
commitdiff
|
raw
2010-02-19
Junio C Hamano
Merge branch 'jk/maint-rmdir-fix' into maint
blob
|
commitdiff
|
raw
2010-02-16
Junio C Hamano
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'maint-1.6.5' into maint
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'gp/maint-cvsserver' into maint
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'jc/maint-reflog-bad-timestamp' into maint
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'il/maint-xmallocz' into maint
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix' into maint
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'nd/include-termios-for-osol' into maint
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
commitdiff
|
raw
2010-02-10
Junio C Hamano
Merge branch 'rs/maint-archive-match-pathspec' into...
blob
|
commitdiff
|
raw
2010-02-09
Junio C Hamano
Merge branch 'maint-1.6.5' into maint
blob
|
commitdiff
|
raw
2010-02-09
Junio C Hamano
Merge branch 'jc/maint-push-doc-status' into maint
blob
|
commitdiff
|
raw
2010-02-08
Junio C Hamano
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
commitdiff
|
raw
2010-02-08
Junio C Hamano
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
commitdiff
|
raw
2010-02-07
Junio C Hamano
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
commitdiff
|
raw
2010-02-06
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-02-05
Junio C Hamano
Merge branch 'jc/maint-limit-note-output' into maint
blob
|
commitdiff
|
raw
2010-01-31
Junio C Hamano
Merge commit 'b319ef7' into jc/maint-fix-test-perm
blob
|
commitdiff
|
raw
|
diff to current
2010-01-30
Junio C Hamano
Merge branch 'maint-1.6.5' into maint
blob
|
commitdiff
|
raw
2010-01-29
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2010-01-28
Junio C Hamano
Merge branch 'gp/maint-cvsserver'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jc/maint-reflog-bad-timestamp'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'il/maint-colon-address'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'il/maint-xmallocz'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jh/maint-config-file-prefix'
blob
|
commitdiff
|
raw
2010-01-27
Junio C Hamano
Merge branch 'jl/diff-submodule-ignore'
blob
|
commitdiff
|
raw
2010-01-25
Junio C Hamano
Merge branch 'jc/fix-tree-walk'
blob
|
commitdiff
|
raw
2010-01-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2010-01-24
Junio C Hamano
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
commitdiff
|
raw
2010-01-19
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2010-01-17
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
blob
|
commitdiff
|
raw
|
diff to current
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-12-31
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-12-27
Junio C Hamano
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-12-09
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
next