Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
[gitweb.git]
/
t
/
t5100
/
patch0015
2010-02-10
Merge branch 'jh/maint-config-file-prefix' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
diff
|
raw
2010-02-09
Merge branch 'jc/maint-push-doc-status' into maint
blob
|
diff
|
raw
2010-02-08
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
diff
|
raw
2010-02-08
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
diff
|
raw
2010-02-07
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
diff
|
raw
2010-02-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-01-29
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-01-27
Merge branch 'jh/maint-config-file-prefix'
blob
|
diff
|
raw
2010-01-24
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
diff
|
raw
2010-01-21
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-20
Merge branch 'bg/maint-remote-update-default' into...
blob
|
diff
|
raw
2010-01-19
Merge branch 'maint-1.6.4' into maint-1.6.5
blob
|
diff
|
raw
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
2010-01-13
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-13
Merge branch 'nd/sparse'
blob
|
diff
|
raw
2010-01-12
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
blob
|
diff
|
raw
2010-01-10
Merge branch 'bg/maint-remote-update-default'
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-12-31
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-12-30
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
2009-12-28
Merge branch 'jk/1.7.0-status'
blob
|
diff
|
raw
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
diff
|
raw
2009-12-26
Merge branch 'gb/1.7.0-diff-whitespace-only-output'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-push-safety'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-send-email-no-thread-default'
blob
|
diff
|
raw
2009-12-26
Merge branch 'sr/vcs-helper'
blob
|
diff
|
raw
2009-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2009-12-09
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-12-09
Merge branch 'mm/maint-merge-ff-error-message-fix'...
blob
|
diff
|
raw
2009-12-09
Merge branch 'jn/maint-pull-rebase-error-message' into...
blob
|
diff
|
raw
2009-12-09
Merge branch 'jk/maint-add-p-delete-fix' into maint
blob
|
diff
|
raw
2009-12-07
Merge branch 'master' into il/vcs-helper
blob
|
diff
|
raw
2009-12-03
Merge branch 'uk/maint-shortlog-encoding' into maint
blob
|
diff
|
raw
2009-12-03
Merge branch 'fc/maint-format-patch-pathspec-dashes...
blob
|
diff
|
raw
2009-12-03
Merge branch 'ap/maint-merge-strategy-list-fix' into...
blob
|
diff
|
raw
2009-12-03
Merge branch 'jc/maint-am-keep' into maint
blob
|
diff
|
raw
2009-12-03
Merge branch 'rs/work-around-grep-opt-insanity' into...
blob
|
diff
|
raw
2009-12-03
Merge branch 'rj/maint-cygwin-count-objects' into maint
blob
|
diff
|
raw
2009-12-03
Merge branch 'mm/maint-hint-failed-merge' into maint
blob
|
diff
|
raw
2009-12-03
Merge branch 'th/maint-remote-update-help-string' into...
blob
|
diff
|
raw
2009-12-03
Merge branch 'rj/maint-t9700' into maint
blob
|
diff
|
raw
2009-12-03
Merge branch 'ls/maint-mailinfo-no-inbody' into maint
blob
|
diff
|
raw
2009-12-03
Merge in 1.6.5.4
blob
|
diff
|
raw
2009-12-03
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-02
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-01
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-01
Merge branch 'jc/deprecate-old-syntax-from-merge'
blob
|
diff
|
raw
2009-12-01
Merge branch 'jn/gitweb-blame'
blob
|
diff
|
raw
2009-11-30
Merge branch 'fc/maint-format-patch-pathspec-dashes'
blob
|
diff
|
raw
2009-11-30
Merge branch 'mm/maint-merge-ff-error-message-fix'
blob
|
diff
|
raw
2009-11-30
Merge branch 'ap/maint-merge-strategy-list-fix'
blob
|
diff
|
raw
2009-11-30
Merge branch 'jc/pretty-lf'
blob
|
diff
|
raw
2009-11-30
Merge branch 'cc/bisect-doc'
blob
|
diff
|
raw
2009-11-30
Merge branch 'em/commit-claim'
blob
|
diff
|
raw
2009-11-30
Merge branch 'jc/mailinfo-remove-brackets'
blob
|
diff
|
raw
2009-11-30
Merge branch 'fc/send-email-envelope'
blob
|
diff
|
raw
2009-11-30
Merge branch 'uk/maint-shortlog-encoding'
blob
|
diff
|
raw
2009-11-30
Merge branch 'jc/maint-am-keep'
blob
|
diff
|
raw
2009-11-30
Merge remote branch 'ko/master' into HEAD
blob
|
diff
|
raw
2009-11-27
Merge branch 'maint'
blob
|
diff
|
raw
2009-11-25
Merge branch 'rs/work-around-grep-opt-insanity'
blob
|
diff
|
raw
2009-11-24
Merge branch 'rj/maint-cygwin-count-objects'
blob
|
diff
|
raw
2009-11-24
Merge branch 'rs/color-escape-has-zero-width'
blob
|
diff
|
raw
2009-11-24
Merge branch 'bg/apply-doc'
blob
|
diff
|
raw
2009-11-24
Merge branch 'mm/maint-hint-failed-merge'
blob
|
diff
|
raw
2009-11-24
Merge branch 'jc/log-stdin'
blob
|
diff
|
raw
2009-11-24
Merge branch 'mr/gitweb-snapshot'
blob
|
diff
|
raw
2009-11-24
Merge branch 'cc/replace'
blob
|
diff
|
raw
2009-11-24
Merge branch 'maint'
blob
|
diff
|
raw
2009-11-23
Merge branch 'bg/fetch-multi'
blob
|
diff
|
raw
2009-11-23
Merge branch 'maint'
blob
|
diff
|
raw
2009-11-23
Merge git://git.bogomips.org/git-svn
blob
|
diff
|
raw
2009-11-23
Merge branch 'th/maint-remote-update-help-string'
blob
|
diff
|
raw
2009-11-23
Merge branch 'jn/faster-completion-startup'
blob
|
diff
|
raw
2009-11-23
Merge branch 'rj/maint-t9700'
blob
|
diff
|
raw
2009-11-23
Merge branch 'ls/maint-mailinfo-no-inbody'
blob
|
diff
|
raw
2009-11-21
git am/mailinfo: Don't look at in-body headers when...
blob
|
diff
|
raw