Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
[gitweb.git]
/
builtin
/
merge-recursive.c
2014-01-13
Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
blob
|
diff
|
raw
2014-01-13
Merge branch 'sb/diff-orderfile-config'
blob
|
diff
|
raw
2014-01-13
Merge branch 'mh/shorten-unambigous-ref'
blob
|
diff
|
raw
2014-01-13
Merge branch 'mm/mv-file-to-no-such-dir-with-slash'
blob
|
diff
|
raw
2014-01-13
Merge branch 'jk/pull-rebase-using-fork-point'
blob
|
diff
|
raw
2014-01-13
Merge branch 'ow/stash-with-ifs'
blob
|
diff
|
raw
2014-01-13
Merge branch 'jn/pager-lv-default-env'
blob
|
diff
|
raw
2014-01-13
Merge branch 'br/sha1-name-40-hex-no-disambiguation'
blob
|
diff
|
raw
2014-01-10
Merge branch 'ta/format-user-manual-as-an-article'
blob
|
diff
|
raw
2014-01-10
Merge branch 'js/lift-parent-count-limit'
blob
|
diff
|
raw
2014-01-10
Merge branch 'jk/test-framework-updates'
blob
|
diff
|
raw
2014-01-10
Merge branch 'bm/merge-base-octopus-dedup'
blob
|
diff
|
raw
2014-01-10
Merge branch 'km/gc-eperm'
blob
|
diff
|
raw
2014-01-10
Merge branch 'jk/http-auth-tests-robustify'
blob
|
diff
|
raw
2014-01-10
Merge branch 'jk/credential-plug-leak'
blob
|
diff
|
raw
2014-01-10
Merge branch 'bs/mirbsd'
blob
|
diff
|
raw
2014-01-10
Merge branch 'nd/commit-tree-constness'
blob
|
diff
|
raw
2014-01-10
Merge branch 'nd/add-empty-fix'
blob
|
diff
|
raw
2014-01-10
Merge branch 'nd/daemon-informative-errors-typofix'
blob
|
diff
|
raw
2014-01-10
Merge branch 'sb/diff-orderfile-config'
blob
|
diff
|
raw
2014-01-10
Merge branch 'bc/log-decoration'
blob
|
diff
|
raw
2014-01-10
Merge branch 'jh/rlimit-nofile-fallback'
blob
|
diff
|
raw
2014-01-10
Merge branch 'rt/bfg-ad-in-filter-branch-doc'
blob
|
diff
|
raw
2014-01-10
Merge branch 'mh/path-max'
blob
|
diff
|
raw
2014-01-10
Merge branch 'ap/path-max'
blob
|
diff
|
raw
2014-01-10
Merge branch 'cc/replace-object-info'
blob
|
diff
|
raw
2014-01-10
Merge branch 'nd/negative-pathspec'
blob
|
diff
|
raw
2014-01-06
Merge branch 'maint'
blob
|
diff
|
raw
2013-12-30
Merge branch 'maint'
blob
|
diff
|
raw
2013-12-27
Merge branch 'fc/remote-helper-fixes'
blob
|
diff
|
raw
2013-12-27
Merge branch 'js/gnome-keyring'
blob
|
diff
|
raw
2013-12-27
Merge branch 'jk/name-pack-after-byte-representation'
blob
|
diff
|
raw
2013-12-27
Merge branch 'tg/diff-no-index-refactor'
blob
|
diff
|
raw
2013-12-27
Merge branch 'zk/difftool-counts'
blob
|
diff
|
raw
2013-12-27
Merge branch 'jk/cat-file-regression-fix'
blob
|
diff
|
raw
2013-12-27
Merge branch 'jk/pull-rebase-using-fork-point'
blob
|
diff
|
raw
2013-12-27
Merge branch 'jk/rev-parse-double-dashes'
blob
|
diff
|
raw
2013-12-27
Merge branch 'jc/push-refmap'
blob
|
diff
|
raw
2013-12-17
Sync with 1.8.5.2
blob
|
diff
|
raw
2013-12-17
Merge branch 'kn/gitweb-extra-branch-refs'
blob
|
diff
|
raw
2013-12-17
Merge branch 'tb/clone-ssh-with-colon-for-port'
blob
|
diff
|
raw
2013-12-17
Merge branch 'nd/transport-positive-depth-only'
blob
|
diff
|
raw
2013-12-17
Merge branch 'cc/starts-n-ends-with'
blob
|
diff
|
raw
2013-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2013-12-09
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-12-05
replace {pre,suf}fixcmp() with {starts,ends}_with()
blob
|
diff
|
raw
2013-11-07
Merge branch 'vd/doc-unpack-objects' into maint
blob
|
diff
|
raw
|
diff to current
2013-11-04
Merge branch 'vd/doc-unpack-objects'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'jk/refs-c-squelch-gcc'
blob
|
diff
|
raw
|
diff to current
2013-10-30
Merge branch 'jk/date-c-double-semicolon'
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'rj/highlight-test-hang'
blob
|
diff
|
raw
|
diff to current
2013-06-17
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2013-05-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-05-13
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-03-28
Merge branch 'jc/remove-treesame-parent-in-simplify...
blob
|
diff
|
raw
|
diff to current
2013-02-04
Merge branch 'dl/am-hg-locale' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'dl/am-hg-locale'
blob
|
diff
|
raw
|
diff to current
2013-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-01-14
Merge branch 'jk/shortlog-no-wrap-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-14
Merge branch 'jl/interrupt-clone-remove-separate-git...
blob
|
diff
|
raw
|
diff to current
2013-01-12
Merge branch 'jk/shortlog-no-wrap-doc'
blob
|
diff
|
raw
|
diff to current
2013-01-10
Merge branch 'ta/remove-stale-translated-tut' into...
blob
|
diff
|
raw
|
diff to current
2013-01-10
Merge branch 'jl/interrupt-clone-remove-separate-git...
blob
|
diff
|
raw
|
diff to current
2013-01-08
Merge branch 'ta/remove-stale-translated-tut'
blob
|
diff
|
raw
|
diff to current
2012-10-17
Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2012-10-08
Merge branch 'os/commit-submodule-ignore' into maint
blob
|
diff
|
raw
|
diff to current
2012-10-01
Merge branch 'os/commit-submodule-ignore'
blob
|
diff
|
raw
|
diff to current
2012-09-15
Merge branch 'da/gitk-reload-tag-contents' into maint...
blob
|
diff
|
raw
|
diff to current
2012-09-12
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2012-09-12
Merge branch 'da/gitk-reload-tag-contents'
blob
|
diff
|
raw
|
diff to current
2012-08-24
Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'jn/block-sha1' into maint
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'ms/daemon-doc-typo' into maint
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'lm/git-blame-el' into maint
blob
|
diff
|
raw
|
diff to current
2012-07-24
Merge branch 'jn/block-sha1'
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'jk/maint-commit-amend-only-no-paths'...
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'tg/maint-cache-name-compare' into maint
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'ms/daemon-doc-typo'
blob
|
diff
|
raw
|
diff to current
2012-07-16
Merge branch 'tg/maint-cache-name-compare'
blob
|
diff
|
raw
|
diff to current
2012-07-16
Merge branch 'jk/maint-commit-amend-only-no-paths'
blob
|
diff
|
raw
|
diff to current
2012-07-11
Merge branch 'tg/maint-cache-name-compare' into tg...
blob
|
diff
|
raw
|
diff to current
2012-06-25
Merge branch 'lp/no-cmd-http-fetch'
blob
|
diff
|
raw
|
diff to current
2012-06-25
Merge branch 'lm/git-blame-el'
blob
|
diff
|
raw
|
diff to current
2012-06-17
Merge branch 'js/maint-fast-export-mark-error' into...
blob
|
diff
|
raw
|
diff to current
2012-06-12
Merge branch 'js/maint-fast-export-mark-error'
blob
|
diff
|
raw
|
diff to current
2012-06-03
Merge branch 'ef/maint-rebase-error-message' into maint
blob
|
diff
|
raw
|
diff to current
2012-06-01
Merge branch 'ef/maint-rebase-error-message'
blob
|
diff
|
raw
|
diff to current
2012-05-23
Merge branch 'js/rev-parse-doc-fix'
blob
|
diff
|
raw
|
diff to current
2012-05-23
Merge branch 'js/rebase-i-p-test-fix'
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
|
diff to current
2012-04-16
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
|
diff to current
2012-04-10
Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
blob
|
diff
|
raw
|
diff to current
2012-04-02
Merge branch 'pt/gitk'
blob
|
diff
|
raw
|
diff to current
2012-03-26
Merge branch 'jn/maint-fast-import-empty-ls' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-24
Merge gitk changes from Paul Mackerras at git://ozlabs...
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge "two fixes for fast-import's 'ls' command" from...
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'th/doc-diff-submodule-option'
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'jc/maint-diff-patch-header' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'jc/maint-diff-patch-header'
blob
|
diff
|
raw
|
diff to current
next