Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
sequencer: improve config handling
[gitweb.git]
/
builtin
/
merge-ours.c
2017-11-09
Merge branch 'js/mingw-redirect-std-handles'
blob
|
diff
|
raw
2017-11-09
Merge branch 'js/wincred-empty-cred'
blob
|
diff
|
raw
2017-11-09
Merge branch 'js/mingw-full-version-in-resources'
blob
|
diff
|
raw
2017-11-09
Merge branch 'dk/libsecret-unlock-to-load-fix'
blob
|
diff
|
raw
2017-11-09
Merge branch 'ks/mailmap'
blob
|
diff
|
raw
2017-11-09
Merge branch 'js/early-config'
blob
|
diff
|
raw
2017-11-09
Merge branch 'sg/travis-fixes'
blob
|
diff
|
raw
2017-11-09
Merge branch 'bw/diff-opt-impl-to-bitfields'
blob
|
diff
|
raw
2017-11-09
Merge branch 'rs/hex-to-bytes-cleanup'
blob
|
diff
|
raw
|
diff to current
2017-11-09
Merge branch 'ad/5580-unc-tests-on-cygwin'
blob
|
diff
|
raw
|
diff to current
2017-11-09
Merge branch 'ao/diff-populate-filespec-lstat-errorpath...
blob
|
diff
|
raw
|
diff to current
2017-11-09
Merge branch 'sb/blame-config-doc'
blob
|
diff
|
raw
|
diff to current
2017-11-09
Merge branch 'jm/relnotes-2.15-typofix'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'tg/deprecate-stash-save'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'tb/complete-checkout'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'gc/gitweb-filetest-acl'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'mp/push-pushoption-config'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'hv/fetch-moved-submodules-on-demand'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'jc/check-ref-format-oor'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'jc/t5601-copy-workaround'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'bc/object-id'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'jk/revision-pruning-optim'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'ds/find-unique-abbrev-optim'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'wk/pull-signoff'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'pc/submodule-helper'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'pb/bisect-helper'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'dm/run-command-ignored-hook-advise'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'ex/deprecate-empty-pathspec-as-match...
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'jk/rebase-i-exec-gitdir-fix'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'cn/diff-indent-no-longer-is-experimental'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'bw/grep-recurse-submodules'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'mh/test-local-canary'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'js/submodule-in-excluded'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'ao/check-resolve-ref-unsafe-result'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'jk/misc-resolve-ref-unsafe-fixes'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'sb/diff-color-moved-use-xdl-recmatch'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'jk/diff-color-moved-fix'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'kd/auto-col-with-pager-fix'
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'jc/no-cmd-as-subroutine'
blob
|
diff
|
raw
|
diff to current
2017-10-11
merge-ours: do not use cmd_*() as a subroutine
blob
|
diff
|
raw
|
diff to current
2017-07-25
Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2017-04-17
Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
blob
|
diff
|
raw
|
diff to current
2017-01-18
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2016-10-20
Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'va/i18n' of ../git-gui into va/git-gui...
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'rs/use-modern-git-merge-syntax' of git...
blob
|
diff
|
raw
|
diff to current
2016-09-11
Merge branch 'js/commit-gpgsign' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'ls/packet-line-protocol-doc-fix' into...
blob
|
diff
|
raw
|
diff to current
2016-09-07
Merge branch 'sy/i18n' of git-gui
blob
|
diff
|
raw
|
diff to current
2016-08-31
Merge branch 'ls/packet-line-protocol-doc-fix'
blob
|
diff
|
raw
|
diff to current
2016-05-26
Merge branch 'va/mailinfo-doc-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2016-05-17
Merge branch 'va/mailinfo-doc-typofix'
blob
|
diff
|
raw
|
diff to current
2016-03-21
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-12-21
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-10-16
Merge branch 'jk/make-findstring-makeflags-fix' into...
blob
|
diff
|
raw
|
diff to current
2015-10-05
Merge branch 'jk/make-findstring-makeflags-fix'
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-09-14
Merge branch 'gb/apply-comment-typofix'
blob
|
diff
|
raw
|
diff to current
2015-09-04
Merge branch 'sg/t3020-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2015-08-26
Merge branch 'sg/t3020-typofix'
blob
|
diff
|
raw
|
diff to current
2015-06-16
Merge branch 'mc/commit-doc-grammofix' into maint
blob
|
diff
|
raw
|
diff to current
2015-06-01
Merge branch 'mc/commit-doc-grammofix'
blob
|
diff
|
raw
|
diff to current
2015-05-26
Merge branch 'sg/complete-decorate-full-not-long' into...
blob
|
diff
|
raw
|
diff to current
2015-05-11
Merge branch 'sg/complete-decorate-full-not-long'
blob
|
diff
|
raw
|
diff to current
2015-04-19
Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2015-03-24
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2015-03-05
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
|
diff to current
2015-02-17
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'rw/apply-does-not-take-ignore-date' into...
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'rw/apply-does-not-take-ignore-date'
blob
|
diff
|
raw
|
diff to current
2014-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-10-29
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
diff
|
raw
|
diff to current
2014-10-14
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
diff
|
raw
|
diff to current
2014-09-26
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
diff
|
raw
|
diff to current
2014-08-10
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-06-27
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-06-26
Merge early parts from git://ozlabs.org/~paulus/gitk.git
blob
|
diff
|
raw
|
diff to current
2014-06-26
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
|
diff to current
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
|
diff to current
2014-01-14
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
blob
|
diff
|
raw
|
diff to current
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-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-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
next