Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅ next
commit
grep
author
committer
pickaxe
?
re
tests: make test_must_fail more verbose
[gitweb.git]
/
t
/
t7405-submodule-merge.sh
2009-06-22
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
diff
|
raw
2009-06-22
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
blob
|
diff
|
raw
2009-06-21
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-06-21
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'ph/submodule-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-20
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-06-14
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-06-14
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
diff
|
raw
|
diff to current
2009-06-13
Merge branch 'ph/submodule-rebase' (early part)
blob
|
diff
|
raw
2009-06-11
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
diff
|
raw
2009-06-02
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
blob
|
diff
|
raw
2009-06-02
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
blob
|
diff
|
raw
2009-05-31
Merge branch 'mw/send-email'
blob
|
diff
|
raw
2009-05-29
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
blob
|
diff
|
raw
2009-05-26
Merge branch 'js/maint-no-ln-across-libexec-and-bin...
blob
|
diff
|
raw
2009-05-26
Merge branch 'lt/maint-diff-reduce-lstat' into maint
blob
|
diff
|
raw
2009-05-26
Merge branch 'do/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
2009-05-26
Merge branch 'jk/maint-1.6.0-trace-argv' into maint
blob
|
diff
|
raw
2009-05-25
Merge branch 'master' into sb/opt-filename
blob
|
diff
|
raw
2009-05-24
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-05-24
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
diff
|
raw
|
diff to current
2009-05-23
Merge branch 'mg/track'
blob
|
diff
|
raw
2009-05-23
Merge branch 'js/maint-no-ln-across-libexec-and-bin'
blob
|
diff
|
raw
2009-05-23
Merge branch 'lt/maint-diff-reduce-lstat'
blob
|
diff
|
raw
2009-05-23
Merge branch 'do/maint-merge-recursive-fix'
blob
|
diff
|
raw
2009-05-23
Merge branch 'jk/maint-1.6.0-trace-argv'
blob
|
diff
|
raw
2009-05-23
Merge branch 'mh/show-branch-color' into sb/show-branch...
blob
|
diff
|
raw
2009-05-18
Merge branch 'js/add-edit'
blob
|
diff
|
raw
2009-05-18
Merge branch 'mh/diff-stat-color'
blob
|
diff
|
raw
2009-05-18
Merge branch 'mh/show-branch-color'
blob
|
diff
|
raw
2009-05-18
Merge branch 'ac/graph-horizontal-line'
blob
|
diff
|
raw
2009-05-18
Merge branch 'ae/anon-fetch-info'
blob
|
diff
|
raw
2009-05-16
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-05-14
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
diff
|
raw
|
diff to current
2009-05-12
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-05-09
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
diff
|
raw
|
diff to current
2009-05-06
Merge branch 'maint'
blob
|
diff
|
raw
2009-05-06
Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-06
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-03
Sync with GIT 1.6.2.5
blob
|
diff
|
raw
2009-05-03
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-03
Merge branch 'mm/maint-add-p-quit' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-03
Merge branch 'lt/pack-object-memuse' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2009-05-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-04-29
Merge branch 'maint'
blob
|
diff
|
raw
2009-04-29
merge-recursive: do not die on a conflicting submodule
blob
|
diff
|
raw
2009-04-29
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-28
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-25
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-20
Merge branch 'mm/maint-add-p-quit'
blob
|
diff
|
raw
|
diff to current
2009-04-19
Merge branch 'ef/maint-fast-export' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-19
Merge branch 'mm/maint-add-p-quit' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-19
Merge branch 'lt/maint-reflog-expire' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-19
Merge branch 'jc/maint-shared-literally' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'lt/pack-object-memuse'
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'js/maint-submodule-checkout' into maint
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'cb/maint-merge-recursive-submodule-fix...
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'da/difftool'
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-13
Mark t1301 permission test to depend on POSIXPERM
blob
|
diff
|
raw
|
diff to current
2009-04-12
Merge branch 'sb/doc-upstream-branch'
blob
|
diff
|
raw
|
diff to current
2009-04-12
Merge branch 'jk/show-upstream'
blob
|
diff
|
raw
|
diff to current
2009-04-12
Merge branch 'fg/remote-prune'
blob
|
diff
|
raw
|
diff to current
2009-04-12
Merge branch 'cc/sha1-bsearch'
blob
|
diff
|
raw
|
diff to current
2009-04-12
Merge branch 'cc/bisect-filter'
blob
|
diff
|
raw
|
diff to current
2009-04-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'lt/reflog-expire'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'ms/http-auth'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'js/maint-submodule-checkout'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'cb/maint-merge-recursive-submodule-fix'
blob
|
diff
|
raw
|
diff to current
2009-04-05
update cache for conflicting submodule entries
blob
|
diff
|
raw
|
diff to current
2009-04-05
add tests for merging with submodules
blob
|
diff
|
raw
|
diff to current