tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Be more user-friendly when refusing to do something because of conflict.
[git.git]
/
t
/
t3501-revert-cherry-pick.sh
2010-01-12
Matthieu Moy
Be more user-friendly when refusing to do something...
blob
|
commitdiff
|
raw
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
2009-10-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-09-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
commitdiff
|
raw
|
diff to current
2009-08-16
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-06-20
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-06-11
Junio C Hamano
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-03
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
commitdiff
|
raw
|
diff to current
2009-05-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-05-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-04-09
Junio C Hamano
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-04-02
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-28
Junio C Hamano
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blame-s'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-26
Junio C Hamano
Merge branch 'bc/maint-1.6.1-branch-deleted-was'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-18
Junio C Hamano
Merge branch 'jc/maint-1.6.0-read-tree-overlay'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-18
Junio C Hamano
Merge branch 'tr/maint-1.6.0-send-email-irt'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'en/maint-1.6.1-hash-object' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'cc/maint-1.6.0-bisect-fix' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'en/maint-hash-object' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'en/maint-hash-object'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'jc/blame'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-03-01
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-28
Junio C Hamano
Merge branch 'cc/maint-1.6.0-bisect-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-27
Junio C Hamano
Merge branch 'cc/maint-1.6.0-bisect-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-25
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'maint-1.5.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'js/notes'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'lt/maint-wrap-zlib' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-01
Junio C Hamano
Merge branch 'ks/maint-mailinfo-folded'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-01
Junio C Hamano
Merge branch 'jk/signal-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'jc/maint-format-patch-o-relative' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'mh/maint-commit-color-status' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'nd/grep-assume-unchanged' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'jc/maint-ls-tree' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'np/no-loosen-prune-expire-now' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'mc/cd-p-pwd' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-26
Junio C Hamano
Merge branch 'kb/lstat-cache'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-26
Junio C Hamano
Merge branch 'js/diff-color-words'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-26
Junio C Hamano
Merge branch 'cb/add-pathspec'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'js/patience-diff'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'cb/maint-unpack-trees-absense' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'tr/maint-no-index-fixes' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'rs/maint-shortlog-foldline' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'pj/maint-ldflags' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'pb/maint-git-pm-false-dir' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'js/maint-bisect-gitk' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'js/add-not-submodule' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'jc/maint-format-patch' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-22
Junio C Hamano
Merge branch 'lt/maint-wrap-zlib'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-22
Junio C Hamano
Merge branch 'rs/ctype'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-22
Junio C Hamano
Merge branch 'jc/maint-format-patch-o-relative'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-22
Junio C Hamano
Merge branch 'kb/am-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'ds/uintmax-config'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'gb/gitweb-opml'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'mv/apply-parse-opt'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'tr/rebase-root'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'gb/gitweb-patch'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'ap/clone-into-empty'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'jc/maint-format-patch'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'tr/maint-no-index-fixes'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'as/autocorrect-alias'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'rs/fgrep'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'rs/maint-shortlog-foldline'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'mh/maint-commit-color-status'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-15
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-15
Stephan Beyer
t3501: check that commits are actually done
blob
|
commitdiff
|
raw
|
diff to current
2008-12-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-18
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-11-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-11-02
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-10-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-09-25
Shawn O. Pearce
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-09-07
Junio C Hamano
Merge updated git-gui and gitk that call each other
blob
|
commitdiff
|
raw
|
diff to current
2008-09-06
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-08-17
Junio C Hamano
Merge git-gui 0.11.0
blob
|
commitdiff
|
raw
|
diff to current
2008-08-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
