Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive: make the error-message generation an extern function
[gitweb.git]
/
t
/
t3030-merge-recursive.sh
2009-10-04
Merge branch 'jc/maint-1.6.4-show-branch-default' into...
blob
|
diff
|
raw
2009-09-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-09-16
Merge branch 'tf/diff-whitespace-incomplete-line' into...
blob
|
diff
|
raw
2009-09-03
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2009-09-03
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2009-09-01
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
diff
|
raw
2009-08-28
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2009-08-28
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
diff
|
raw
|
diff to current
2009-08-26
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
blob
|
diff
|
raw
2009-08-22
Merge branch 'cc/replace'
blob
|
diff
|
raw
2009-08-21
Merge branch 'jc/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
2009-08-19
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
blob
|
diff
|
raw
2009-08-16
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-08-11
Merge branch 'jc/maint-merge-recursive-fix'
blob
|
diff
|
raw
2009-08-08
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
2009-08-05
Merge branch 'ne/futz-upload-pack'
blob
|
diff
|
raw
2009-07-29
Merge branch 'hv/cvsps-tests'
blob
|
diff
|
raw
2009-07-09
Merge branch 'ml/http'
blob
|
diff
|
raw
2009-07-08
Merge branch 'cb/maint-fetch-refspec-wo-dst' into maint
blob
|
diff
|
raw
2009-07-06
Merge branch 'tr/die_errno'
blob
|
diff
|
raw
2009-07-06
Merge branch 'cb/maint-fetch-refspec-wo-dst'
blob
|
diff
|
raw
2009-07-06
Merge branch 'gb/am-foreign'
blob
|
diff
|
raw
2009-07-06
Merge branch 'uk/rev-parse-parse-opt'
blob
|
diff
|
raw
2009-07-02
Merge branch 'cc/bisect'
blob
|
diff
|
raw
2009-07-02
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
blob
|
diff
|
raw
2009-06-22
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
diff
|
raw
2009-06-22
Merge branch 'ak/maint-for-each-ref-no-lookup' into...
blob
|
diff
|
raw
2009-06-22
Merge branch 'rc/maint-http-local-slot-fix' into maint
blob
|
diff
|
raw
2009-06-22
Merge branch 'cb/maint-no-double-merge' into maint
blob
|
diff
|
raw
2009-06-21
Merge branch 'maint'
blob
|
diff
|
raw
2009-06-21
Merge branch 'ph/submodule-rebase'
blob
|
diff
|
raw
2009-06-21
Merge branch 'jc/cache-tree'
blob
|
diff
|
raw
2009-06-21
Merge branch 'mg/pushurl'
blob
|
diff
|
raw
2009-06-21
Merge branch 'mn/maint-iconv-autoconf'
blob
|
diff
|
raw
2009-06-21
Merge branch 'sb/pull-rebase'
blob
|
diff
|
raw
2009-06-21
Merge branch 'pb/maint-1.6.2-userdiff-fix'
blob
|
diff
|
raw
2009-06-21
Merge branch 'sb/maint-1.6.0-add-config-fix'
blob
|
diff
|
raw
2009-06-21
Merge branch 'lt/maint-unsigned-left-shift'
blob
|
diff
|
raw
2009-06-20
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-06-18
Merge branch 'maint'
blob
|
diff
|
raw
2009-06-18
Merge branch 'sb/parse-options-integer'
blob
|
diff
|
raw
2009-06-18
Merge branch 'ak/maint-for-each-ref-no-lookup'
blob
|
diff
|
raw
2009-06-14
Merge branch 'maint'
blob
|
diff
|
raw
2009-06-13
Merge branch 'mh/fix-send-email-threaded'
blob
|
diff
|
raw
2009-06-13
Merge branch 'rc/http-push'
blob
|
diff
|
raw
2009-06-13
Merge branch 'cc/bisect' (early part)
blob
|
diff
|
raw
2009-06-13
Merge branch 'rc/maint-http-local-slot-fix'
blob
|
diff
|
raw
2009-06-13
Merge branch 'sp/msysgit'
blob
|
diff
|
raw
2009-06-13
Merge branch 'cb/maint-no-double-merge'
blob
|
diff
|
raw
2009-06-11
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
diff
|
raw
|
diff to current
2009-06-02
refuse to merge during a merge
blob
|
diff
|
raw
2009-05-03
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
diff
|
raw
|
diff to current
2009-05-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2009-05-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-04-09
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...
blob
|
diff
|
raw
|
diff to current
2009-04-09
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-04-02
Merge branch 'jc/maint-1.6.0-blame-s' into maint
blob
|
diff
|
raw
|
diff to current
2009-03-28
Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'
blob
|
diff
|
raw
|
diff to current
2009-03-26
Merge branch 'jc/maint-1.6.0-blame-s'
blob
|
diff
|
raw
|
diff to current
2009-03-22
Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
blob
|
diff
|
raw
|
diff to current
2009-03-18
Merge branch 'jc/maint-1.6.0-read-tree-overlay'
blob
|
diff
|
raw
|
diff to current
2009-03-02
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-02-11
Merge branch 'maint-1.5.6' into maint
blob
|
diff
|
raw
|
diff to current
2009-02-11
Merge branch 'maint-1.5.5' into maint-1.5.6
blob
|
diff
|
raw
|
diff to current
2009-01-24
Merge branch 'cb/maint-unpack-trees-absense' into maint
blob
|
diff
|
raw
|
diff to current
2009-01-14
Merge branch 'cb/maint-unpack-trees-absense'
blob
|
diff
|
raw
|
diff to current
2009-01-13
Merge branch 'ap/maint-apply-modefix' into maint
blob
|
diff
|
raw
|
diff to current
2009-01-07
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
diff
|
raw
|
diff to current
2009-01-03
Merge branch 'ap/maint-apply-modefix'
blob
|
diff
|
raw
|
diff to current
2008-12-27
Merge branch 'sp/maint-describe-all-tag-warning' into...
blob
|
diff
|
raw
|
diff to current
2008-12-22
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-12-20
GIT 1.6.0.6
v1.6.0.6
blob
|
diff
|
raw
|
diff to current
2008-12-18
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-12-17
GIT 1.5.6.6
v1.5.6.6
blob
|
diff
|
raw
|
diff to current
2008-12-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-12-02
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-12-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-12-01
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-16
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-13
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-11-13
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge branch 'js/maint-fetch-update-head' into maint
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-11-02
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
diff
|
raw
|
diff to current
2008-10-22
Merge branch 'js/maint-fetch-update-head'
blob
|
diff
|
raw
|
diff to current
2008-10-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2008-10-19
Merge branch 'tr/workflow-doc'
blob
|
diff
|
raw
|
diff to current
2008-10-18
Merge branch 'db/maint-checkout-b' into maint
blob
|
diff
|
raw
|
diff to current
2008-10-18
Merge branch 'pb/commit-where'
blob
|
diff
|
raw
|
diff to current
2008-10-09
Merge branch 'lt/time-reject-fractional-seconds'
blob
|
diff
|
raw
|
diff to current
2008-10-09
Merge branch 'jc/add-ita'
blob
|
diff
|
raw
|
diff to current
2008-09-29
Merge branch 'maint' into bc/master-diff-hunk-header-fix
blob
|
diff
|
raw
|
diff to current
2008-09-29
Merge branch 'bc/maint-diff-hunk-header-fix' into maint
blob
|
diff
|
raw
|
diff to current
2008-09-29
Merge branch 'jc/better-conflict-resolution'
blob
|
diff
|
raw
|
diff to current
2008-09-29
Merge branch 'mg/maint-remote-fix' into maint
blob
|
diff
|
raw
|
diff to current
2008-09-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2008-09-26
Remove empty directories in recursive merge
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge branch 'mv/merge-recursive'
blob
|
diff
|
raw
|
diff to current
2008-09-25
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2008-09-19
Merge branch 'jc/diff-prefix'
blob
|
diff
|
raw
|
diff to current
next