Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
tests: document cherry-pick behavior in face of conflicts
[gitweb.git]
/
t
/
t6029-merge-subtree.sh
2008-11-13
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2008-11-13
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-11-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-11-02
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
2008-10-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2008-09-25
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-09-07
Merge updated git-gui and gitk that call each other
blob
|
diff
|
raw
2008-09-06
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
2008-08-17
Merge git-gui 0.11.0
blob
|
diff
|
raw
2008-08-17
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2008-08-06
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-08-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2008-07-30
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-07-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-07-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-07-08
Merge branch 'jc/blame' (early part) into HEAD
blob
|
diff
|
raw
2008-07-08
Merge branch 'lt/racy-empty' into maint
blob
|
diff
|
raw
2008-07-07
Merge branch 'dr/ceiling'
blob
|
diff
|
raw
2008-07-06
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2008-06-27
Merge branch 'maint-1.5.5' into maint
blob
|
diff
|
raw
2008-06-27
Merge branch 'maint-1.5.4' into maint-1.5.5
blob
|
diff
|
raw
|
diff to current
2008-06-25
Merge branch 'jc/maint-combine-diff-pre-context' into...
blob
|
diff
|
raw
2008-06-22
Merge branch 'lt/racy-empty'
blob
|
diff
|
raw
2008-06-22
Merge branch 'jc/maint-combine-diff-pre-context'
blob
|
diff
|
raw
2008-06-17
Merge branch 'maint'
blob
|
diff
|
raw
2008-06-16
Merge branch 'maint'
blob
|
diff
|
raw
2008-06-11
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2008-06-11
Merge branch 'maint'
blob
|
diff
|
raw
2008-06-09
Merge branch 'js/merge-recursive'
blob
|
diff
|
raw
2008-06-09
Merge branch 'maint'
blob
|
diff
|
raw
2008-06-07
Merge 1.5.5.4 in
blob
|
diff
|
raw
2008-06-06
Merge branch 'maint'
blob
|
diff
|
raw
2008-06-04
Merge branch 'maint'
blob
|
diff
|
raw
2008-05-28
Merge 1.5.5.3 in
blob
|
diff
|
raw
2008-05-27
Merge branch 'jc/diff-no-no-index'
blob
|
diff
|
raw
2008-05-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-05-26
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-24
tests: do not use implicit "git diff --no-index"
blob
|
diff
|
raw
2008-05-24
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-05-23
Merge branch 'maint-1.5.4' into maint
v1.5.5.2
blob
|
diff
|
raw
|
diff to current
2008-05-21
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-05-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-05-14
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-11
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-09
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-05-04
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-30
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-28
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-25
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-23
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-19
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-17
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-16
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-12
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-12
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-10
Merge branch 'maint-1.5.4' into maint
blob
|
diff
|
raw
|
diff to current
2008-04-09
Merge branch 'jc/rename'
blob
|
diff
|
raw
|
diff to current
2008-04-09
Merge branch 'mk/unpack-careful'
blob
|
diff
|
raw
|
diff to current
2008-04-09
Merge branch 'fl/send-email-outside'
blob
|
diff
|
raw
|
diff to current
2008-04-08
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-04-07
Merge branch 'jc/maint-apply-match-beginning'
blob
|
diff
|
raw
|
diff to current
2008-04-05
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-04-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-28
GIT 1.5.5-rc2
v1.5.5-rc2
blob
|
diff
|
raw
|
diff to current
2008-03-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-26
Merge branch 'jc/maint-fetch-regression-1.5.4'
blob
|
diff
|
raw
|
diff to current
2008-03-23
Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
blob
|
diff
|
raw
|
diff to current
2008-03-17
Merge branch 'jc/makefile'
blob
|
diff
|
raw
|
diff to current
2008-03-16
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-16
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-15
Merge branch 'jk/portable'
blob
|
diff
|
raw
|
diff to current
2008-03-15
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-15
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-15
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-03-14
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-13
add test_cmp function for test scripts
blob
|
diff
|
raw
|
diff to current
2008-03-13
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-12
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-03-12
Merge branch 'js/remote'
blob
|
diff
|
raw
|
diff to current
2008-03-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-11
Merge branch 'jc/cherry-pick' (early part)
blob
|
diff
|
raw
|
diff to current
2008-03-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-09
Merge branch 'kb/maint-filter-branch-disappear'
blob
|
diff
|
raw
|
diff to current
2008-03-09
Merge branch 'maint' to sync with 1.5.4.4
blob
|
diff
|
raw
|
diff to current
2008-03-08
Merge branch 'aw/maint-shortlog-blank-lines'
blob
|
diff
|
raw
|
diff to current
2008-03-08
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-08
Merge branch 'js/reflog-delete'
blob
|
diff
|
raw
|
diff to current
2008-03-04
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-03
Merge commit '74359821' into js/reflog-delete
blob
|
diff
|
raw
|
diff to current
2008-03-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-03-03
Merge branch 'np/verify-pack'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'sp/describe-tag'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'pb/cvsimport'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'jc/maint-log-merge-left-right'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'mh/maint-http-proxy-fix'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'cb/http-test'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'jc/remote-multi-url'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'jn/gitweb-grep'
blob
|
diff
|
raw
|
diff to current
2008-03-02
Merge branch 'mk/maint-parse-careful'
blob
|
diff
|
raw
|
diff to current
next