Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
switch: reject if some operation is in progress
[gitweb.git]
/
builtin
/
merge-ours.c
2019-01-29
Merge branch 'cc/partial-clone-doc-typofix'
blob
|
diff
|
raw
2019-01-29
Merge branch 'kg/external-diff-save-env'
blob
|
diff
|
raw
2019-01-24
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
blob
|
diff
|
raw
|
diff to current
2019-01-18
Merge branch 'js/gc-repack-close-before-remove'
blob
|
diff
|
raw
2019-01-18
Merge branch 'en/show-ref-doc-fix'
blob
|
diff
|
raw
2019-01-18
Merge branch 'ot/ref-filter-object-info'
blob
|
diff
|
raw
2019-01-18
Merge branch 'sg/stress-test'
blob
|
diff
|
raw
2019-01-18
Merge branch 'rs/sha1-file-close-mapped-file-on-error'
blob
|
diff
|
raw
2019-01-18
Merge branch 'po/git-p4-wo-login'
blob
|
diff
|
raw
2019-01-18
Merge branch 'tg/t5570-drop-racy-test'
blob
|
diff
|
raw
2019-01-18
Merge branch 'jk/dev-build-format-security'
blob
|
diff
|
raw
2019-01-18
Merge branch 'so/cherry-pick-always-allow-m1'
blob
|
diff
|
raw
2019-01-18
Merge branch 'nd/worktree-remove-with-uninitialized...
blob
|
diff
|
raw
2019-01-18
Merge branch 'sg/test-bash-version-fix'
blob
|
diff
|
raw
2019-01-18
Merge branch 'rb/hpe'
blob
|
diff
|
raw
2019-01-18
Merge branch 'ed/simplify-setup-git-dir'
blob
|
diff
|
raw
2019-01-18
Merge branch 'cy/zsh-completion-SP-in-path'
blob
|
diff
|
raw
2019-01-18
Merge branch 'cy/completion-typofix'
blob
|
diff
|
raw
2019-01-18
Merge branch 'ew/ban-strncat'
blob
|
diff
|
raw
2019-01-18
Merge branch 'ds/commit-graph-assert-missing-parents'
blob
|
diff
|
raw
2019-01-18
Merge branch 'es/doc-worktree-guessremote-config'
blob
|
diff
|
raw
2019-01-18
Merge branch 'sb/submodule-unset-core-worktree-when...
blob
|
diff
|
raw
2019-01-18
Merge branch 'ma/asciidoctor'
blob
|
diff
|
raw
2019-01-18
Merge branch 'jn/stripspace-wo-repository'
blob
|
diff
|
raw
2019-01-18
Merge branch 'sb/submodule-fetchjobs-default-to-one'
blob
|
diff
|
raw
2019-01-18
Merge branch 'la/quiltimport-keep-non-patch'
blob
|
diff
|
raw
2019-01-18
Merge branch 'nd/style-opening-brace'
blob
|
diff
|
raw
2019-01-18
Merge branch 'ds/gc-doc-typofix'
blob
|
diff
|
raw
2019-01-15
Merge branch 'nd/the-index' into md/list-objects-filter...
blob
|
diff
|
raw
2019-01-14
Merge branch 'do/gitweb-strict-export-conf-doc'
blob
|
diff
|
raw
2019-01-14
Merge branch 'nd/indentation-fix'
blob
|
diff
|
raw
2019-01-14
Merge branch 'en/directory-renames-nothanks-doc-update'
blob
|
diff
|
raw
2019-01-14
Merge branch 'bw/mailmap'
blob
|
diff
|
raw
2019-01-14
Merge branch 'fd/gitweb-snapshot-conf-doc-fix'
blob
|
diff
|
raw
2019-01-14
Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'
blob
|
diff
|
raw
2019-01-14
Merge branch 'km/rebase-doc-typofix'
blob
|
diff
|
raw
2019-01-14
Merge branch 'md/exclude-promisor-objects-fix-cleanup'
blob
|
diff
|
raw
2019-01-14
Merge branch 'tb/log-G-binary'
blob
|
diff
|
raw
2019-01-14
Merge branch 'sb/diff-color-moved-config-option-fixup'
blob
|
diff
|
raw
2019-01-14
Merge branch 'hn/highlight-sideband-keywords'
blob
|
diff
|
raw
2019-01-14
Merge branch 'cb/test-lint-cp-a'
blob
|
diff
|
raw
2019-01-14
Merge branch 'cb/t5004-empty-tar-archive-fix'
blob
|
diff
|
raw
2019-01-14
Merge branch 'cb/openbsd-allows-reading-directory'
blob
|
diff
|
raw
2019-01-14
Merge branch 'hb/t0061-dot-in-path-fix'
blob
|
diff
|
raw
2019-01-14
Merge branch 'nd/checkout-noisy'
blob
|
diff
|
raw
2019-01-14
Merge branch 'ab/commit-graph-progress-fix'
blob
|
diff
|
raw
2019-01-14
Merge branch 'nd/attr-pathspec-in-tree-walk'
blob
|
diff
|
raw
2019-01-14
Merge branch 'md/list-lazy-objects-fix'
blob
|
diff
|
raw
2019-01-14
Merge branch 'ms/packet-err-check' into jt/fetch-v2...
blob
|
diff
|
raw
2019-01-04
Merge branch 'mk/http-backend-kill-children-before...
blob
|
diff
|
raw
2019-01-04
Merge branch 'sd/stash-wo-user-name'
blob
|
diff
|
raw
2019-01-04
Merge branch 'sg/clone-initial-fetch-configuration'
blob
|
diff
|
raw
2019-01-04
Merge branch 'nd/checkout-dwim-fix'
blob
|
diff
|
raw
2019-01-04
Merge branch 'ab/push-dwim-dst'
blob
|
diff
|
raw
2019-01-04
Merge branch 'en/fast-export-import'
blob
|
diff
|
raw
2019-01-04
Merge branch 'nd/the-index'
blob
|
diff
|
raw
2018-11-21
Merge branch 'nd/packobjectshook-doc-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-11-21
Merge branch 'jk/check-everything-connected-is-long...
blob
|
diff
|
raw
|
diff to current
2018-11-21
Merge branch 'np/log-graph-octopus-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-11-21
Merge branch 'nd/attr-pathspec-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-11-12
diff-lib.c: remove the_repository references
blob
|
diff
|
raw
2018-10-31
Adjust for 2.19.x series
blob
|
diff
|
raw
|
diff to current
2018-10-26
Merge branch 'np/log-graph-octopus-fix'
blob
|
diff
|
raw
|
diff to current
2018-10-25
t0061: adjust to test-tool transition
blob
|
diff
|
raw
|
diff to current
2018-10-16
Merge branch 'nd/packobjectshook-doc-fix'
blob
|
diff
|
raw
|
diff to current
2018-10-16
Merge branch 'jk/check-everything-connected-is-long...
blob
|
diff
|
raw
|
diff to current
2018-09-27
Sync with 2.15.3
blob
|
diff
|
raw
|
diff to current
2018-09-24
Merge branch 'nd/attr-pathspec-fix'
blob
|
diff
|
raw
|
diff to current
2018-08-27
Merge branch 'sg/t7501-thinkofix'
blob
|
diff
|
raw
|
diff to current
2018-08-27
Merge branch 'sg/t0020-conversion-fix'
blob
|
diff
|
raw
|
diff to current
2018-08-27
Merge branch 'sg/t4051-fix'
blob
|
diff
|
raw
|
diff to current
2018-08-27
Merge branch 'js/larger-timestamps'
blob
|
diff
|
raw
|
diff to current
2018-08-20
Merge branch 'nd/cherry-pick-quit-fix'
blob
|
diff
|
raw
|
diff to current
2018-08-20
Merge branch 'sb/pull-rebase-submodule'
blob
|
diff
|
raw
|
diff to current
2018-08-20
Merge branch 'js/typofixes'
blob
|
diff
|
raw
|
diff to current
2018-08-17
Merge branch 'en/t3031-title-fix'
blob
|
diff
|
raw
|
diff to current
2018-08-15
Merge branch 'sb/histogram-less-memory'
blob
|
diff
|
raw
|
diff to current
2018-08-15
Merge branch 'sg/fast-import-dump-refs-on-checkpoint...
blob
|
diff
|
raw
|
diff to current
2018-08-15
Merge branch 'jk/ui-color-always-to-auto'
blob
|
diff
|
raw
|
diff to current
2018-08-02
Merge branch 'sg/httpd-test-unflake'
blob
|
diff
|
raw
|
diff to current
2018-07-24
Merge branch 'jk/fetch-all-peeled-fix'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'jk/fetch-all-peeled-fix'
blob
|
diff
|
raw
|
diff to current
2018-06-28
Merge branch 'jh/partial-clone'
blob
|
diff
|
raw
|
diff to current
2018-06-18
Merge branch 'ks/branch-set-upstream'
blob
|
diff
|
raw
|
diff to current
2018-06-18
Merge branch 'mw/doc-merge-enumfix'
blob
|
diff
|
raw
|
diff to current
2018-06-18
Merge branch 'km/doc-workflows-typofix'
blob
|
diff
|
raw
|
diff to current
2018-06-18
Merge branch 'rd/diff-options-typofix'
blob
|
diff
|
raw
|
diff to current
2018-05-30
Merge branch 'sb/grep-die-on-unreadable-index'
blob
|
diff
|
raw
|
diff to current
2018-05-30
Merge branch 'rs/no-null-ptr-arith-in-fast-export'
blob
|
diff
|
raw
|
diff to current
2018-05-30
Merge branch 'nd/repo-clear-keep-the-index'
blob
|
diff
|
raw
|
diff to current
2018-05-23
Merge branch 'tb/test-apfs-utf8-normalization'
blob
|
diff
|
raw
|
diff to current
2018-05-22
Sync with Git 2.15.2
blob
|
diff
|
raw
|
diff to current
2018-05-22
Merge branch 'jk/submodule-name-verify-fix' into jk...
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'nd/submodule-status-fix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ab/git-svn-get-record-typofix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'sg/doc-gc-quote-mismatch-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'bp/fsmonitor-bufsize-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'es/fread-reads-dir-autoconf-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'js/t5404-path-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'mn/send-email-credential-doc'
blob
|
diff
|
raw
|
diff to current
next