Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/options-cleanup'
[gitweb.git]
/
builtin
/
merge-recursive.c
2016-02-10
Merge branch 'js/xmerge-marker-eol'
blob
|
diff
|
raw
2016-02-05
Merge branch 'lv/add-doc-working-tree' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'ss/clone-depth-single-doc' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'sg/t6050-failing-editor-test-fix' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'ew/for-each-ref-doc' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'ss/user-manual' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'js/dirname-basename' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'tb/complete-word-diff-regex' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'nd/diff-with-path-params' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'ew/svn-1.9.0-auth' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'jk/sanity' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'ho/gitweb-squelch-undef-warning' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'js/fopen-harder' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'nd/exclusion-regression-fix' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'dk/reflog-walk-with-non-commit' into...
blob
|
diff
|
raw
2016-02-05
Merge branch 'dw/signoff-doc' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'jk/clang-pedantic' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'ew/send-email-mutt-alias-fix' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'nd/dir-exclude-cleanup' into maint
blob
|
diff
|
raw
2016-02-05
Merge branch 'nd/stop-setenv-work-tree' into maint
blob
|
diff
|
raw
2016-02-03
Merge branch 'js/dirname-basename'
blob
|
diff
|
raw
2016-02-03
Merge branch 'nd/diff-with-path-params'
blob
|
diff
|
raw
2016-02-03
Merge branch 'lv/add-doc-working-tree'
blob
|
diff
|
raw
2016-02-03
Merge branch 'tb/complete-word-diff-regex'
blob
|
diff
|
raw
2016-02-01
Merge branch 'ew/svn-1.9.0-auth'
blob
|
diff
|
raw
2016-01-29
Merge branch 'jk/sanity'
blob
|
diff
|
raw
2016-01-26
Merge branch 'jk/ok-to-fail-gc-auto-in-rebase'
blob
|
diff
|
raw
2016-01-22
Merge branch 'rm/subtree-unwrap-tags'
blob
|
diff
|
raw
2016-01-20
Merge branch 'tg/grep-no-index-fallback'
blob
|
diff
|
raw
2016-01-20
Merge branch 'ho/gitweb-squelch-undef-warning'
blob
|
diff
|
raw
2016-01-20
Merge branch 'js/fopen-harder'
blob
|
diff
|
raw
2016-01-20
Merge branch 'ss/clone-depth-single-doc'
blob
|
diff
|
raw
2016-01-20
Merge branch 'nd/exclusion-regression-fix'
blob
|
diff
|
raw
2016-01-20
Merge branch 'dk/reflog-walk-with-non-commit'
blob
|
diff
|
raw
2016-01-20
Merge branch 'sg/t6050-failing-editor-test-fix'
blob
|
diff
|
raw
2016-01-20
Merge branch 'ew/for-each-ref-doc'
blob
|
diff
|
raw
2016-01-20
Merge branch 'dw/signoff-doc'
blob
|
diff
|
raw
2016-01-20
Merge branch 'jk/clang-pedantic'
blob
|
diff
|
raw
2016-01-20
Merge branch 'ew/send-email-mutt-alias-fix'
blob
|
diff
|
raw
2016-01-20
Merge branch 'ss/user-manual'
blob
|
diff
|
raw
2016-01-20
Merge branch 'nd/clear-gitenv-upon-use-of-alias'
blob
|
diff
|
raw
2016-01-20
Merge branch 'nd/ita-cleanup'
blob
|
diff
|
raw
2016-01-20
Merge branch 'nd/dir-exclude-cleanup'
blob
|
diff
|
raw
2016-01-20
Merge branch 'jk/pack-revindex'
blob
|
diff
|
raw
2016-01-12
Merge branch 'ea/blame-progress'
blob
|
diff
|
raw
2016-01-12
Merge branch 'ep/make-phoney'
blob
|
diff
|
raw
2016-01-12
Merge branch 'nd/stop-setenv-work-tree'
blob
|
diff
|
raw
2016-01-04
Sync with 2.6.5
blob
|
diff
|
raw
2015-12-28
Merge branch 'jk/pending-keep-tag-name'
blob
|
diff
|
raw
2015-12-28
Merge branch 'jk/symbolic-ref-maint'
blob
|
diff
|
raw
2015-12-22
Merge branch 'js/emu-write-epipe-on-windows'
blob
|
diff
|
raw
2015-12-21
Merge branch 'jk/ident-loosen-getpwuid'
blob
|
diff
|
raw
2015-12-21
Merge branch 'jk/send-email-ssl-errors'
blob
|
diff
|
raw
2015-12-21
Merge branch 'sg/completion-no-column'
blob
|
diff
|
raw
2015-12-21
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2015-12-16
Merge branch 'fr/rebase-i-continue-preserve-options'
blob
|
diff
|
raw
2015-12-16
Merge branch 'maint'
blob
|
diff
|
raw
2015-12-15
Sync with maint
blob
|
diff
|
raw
2015-12-15
Merge branch 'ep/ident-with-getaddrinfo'
blob
|
diff
|
raw
2015-12-15
Merge branch 'ls/p4-keep-empty-commits'
blob
|
diff
|
raw
2015-12-15
Merge branch 'jk/prune-mtime'
blob
|
diff
|
raw
2015-12-11
Merge branch 'maint'
blob
|
diff
|
raw
2015-12-11
Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
blob
|
diff
|
raw
2015-12-11
Merge branch 'sb/doc-submodule-sync-recursive'
blob
|
diff
|
raw
2015-12-11
Merge branch 'cb/t3404-shellquote'
blob
|
diff
|
raw
2015-12-11
Merge branch 'sg/lock-file-commit-error'
blob
|
diff
|
raw
2015-12-10
Sync with maint
blob
|
diff
|
raw
2015-12-10
Merge branch 'nd/doc-check-ref-format-typo'
blob
|
diff
|
raw
2015-12-10
Merge branch 'dt/fsck-verify-pack-error'
blob
|
diff
|
raw
2015-12-08
Merge branch 'ep/ident-with-getaddrinfo'
blob
|
diff
|
raw
2015-12-08
Sync with 2.6.4
blob
|
diff
|
raw
2015-12-04
Sync with maint
blob
|
diff
|
raw
2015-12-04
Merge branch 'sg/bash-prompt-dirty-orphan'
blob
|
diff
|
raw
2015-12-04
Merge branch 'ad/sha1-update-chunked'
blob
|
diff
|
raw
2015-12-01
Merge branch 'mk/blame-first-parent'
blob
|
diff
|
raw
2015-12-01
Merge branch 'maint'
blob
|
diff
|
raw
2015-11-25
Merge branch 'fp/subtree-todo-update'
blob
|
diff
|
raw
2015-11-25
Merge branch 'rc/configure-use-libs-when-checking-a...
blob
|
diff
|
raw
2015-11-25
Merge branch 'maint'
blob
|
diff
|
raw
2015-11-20
Merge branch 'dk/gc-idx-wo-pack'
blob
|
diff
|
raw
2015-11-05
Merge branch 'ea/checkout-progress'
blob
|
diff
|
raw
2015-11-05
Sync with 2.6.3
blob
|
diff
|
raw
2015-11-05
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
diff
|
raw
|
diff to current
2015-11-04
Sync with maint
blob
|
diff
|
raw
2015-11-03
Sync with maint
blob
|
diff
|
raw
2015-11-03
Merge branch 'rs/daemon-plug-child-leak'
blob
|
diff
|
raw
2015-11-03
Merge branch 'mk/blame-first-parent'
blob
|
diff
|
raw
2015-11-03
Merge branch 'rs/wt-status-detached-branch-fix'
blob
|
diff
|
raw
2015-11-03
Merge branch 'rs/show-branch-argv-array'
blob
|
diff
|
raw
2015-11-03
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
diff
|
raw
2015-11-03
Merge branch 'da/difftool'
blob
|
diff
|
raw
2015-11-03
Merge branch 'jc/mailinfo-lib'
blob
|
diff
|
raw
2015-11-03
Merge branch 'kn/for-each-branch'
blob
|
diff
|
raw
2015-10-30
Merge branch 'jk/merge-file-exit-code'
blob
|
diff
|
raw
2015-10-30
Merge branch 'gr/rebase-i-drop-warn'
blob
|
diff
|
raw
2015-10-30
Merge branch 'xf/user-manual-ff'
blob
|
diff
|
raw
2015-10-30
Merge branch 'rs/pop-commit'
blob
|
diff
|
raw
2015-10-30
Merge branch 'mk/blame-error-message'
blob
|
diff
|
raw
2015-10-30
Merge branch 'js/misc-fixes'
blob
|
diff
|
raw
next