Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
commit-graph: always load commit-graph information
[gitweb.git]
/
merge.c
2017-12-27
Merge branch 'jh/object-filtering'
blob
|
diff
|
raw
2017-12-22
Merge branch 'ew/empty-merge-with-dirty-index-maint...
blob
|
diff
|
raw
|
diff to current
2017-12-22
move index_has_changes() from builtin/am.c to merge...
blob
|
diff
|
raw
|
diff to current
2017-12-19
Merge branch 'ls/editor-waiting-message'
blob
|
diff
|
raw
2017-12-19
Merge branch 'sg/setup-doc-update'
blob
|
diff
|
raw
2017-12-19
Merge branch 'bw/submodule-config-cleanup'
blob
|
diff
|
raw
2017-12-19
Merge branch 'bw/pathspec-match-submodule-boundary'
blob
|
diff
|
raw
2017-12-19
Merge branch 'en/merge-recursive-icase-removal'
blob
|
diff
|
raw
2017-12-13
Merge branch 'js/hashmap-update-sample'
blob
|
diff
|
raw
2017-12-13
Merge branch 'jk/no-optional-locks'
blob
|
diff
|
raw
2017-12-13
Merge branch 'jk/progress-delay-fix'
blob
|
diff
|
raw
2017-12-13
Merge branch 'ks/doc-checkout-previous'
blob
|
diff
|
raw
2017-12-13
Merge branch 'tg/t-readme-updates'
blob
|
diff
|
raw
2017-12-13
Merge branch 'pc/submodule-helper'
blob
|
diff
|
raw
2017-12-13
Merge branch 'jc/receive-pack-hook-doc'
blob
|
diff
|
raw
2017-12-06
Sync with maint
blob
|
diff
|
raw
2017-12-06
Merge branch 'jn/ssh-wrappers'
blob
|
diff
|
raw
2017-12-06
Merge branch 'bw/protocol-v1'
blob
|
diff
|
raw
2017-12-06
Merge branch 'sp/doc-info-attributes'
blob
|
diff
|
raw
2017-12-06
Merge branch 'ph/stash-save-m-option-fix'
blob
|
diff
|
raw
2017-12-06
Merge branch 'jk/fewer-pack-rescan'
blob
|
diff
|
raw
2017-12-06
Merge branch 'tg/deprecate-stash-save'
blob
|
diff
|
raw
2017-12-06
Merge branch 'rd/doc-notes-prune-fix'
blob
|
diff
|
raw
2017-12-06
Merge branch 'rd/man-reflog-add-n'
blob
|
diff
|
raw
2017-12-06
Merge branch 'rd/man-prune-progress'
blob
|
diff
|
raw
2017-12-06
Merge branch 'cc/git-packet-pm'
blob
|
diff
|
raw
2017-12-06
Merge branch 'tz/branch-doc-remove-set-upstream'
blob
|
diff
|
raw
2017-12-06
Merge branch 'cc/perf-run-config'
blob
|
diff
|
raw
2017-12-06
Merge branch 'sb/submodule-recursive-checkout-detach...
blob
|
diff
|
raw
2017-12-06
Merge branch 'jc/merge-base-fork-point-doc' into maint
blob
|
diff
|
raw
|
diff to current
2017-12-06
Merge branch 'tz/notes-error-to-stderr' into maint
blob
|
diff
|
raw
|
diff to current
2017-12-06
Merge branch 'rs/apply-inaccurate-eof-with-incomplete...
blob
|
diff
|
raw
|
diff to current
2017-12-06
Merge branch 'sw/pull-ipv46-passthru' into maint
blob
|
diff
|
raw
|
diff to current
2017-12-05
Merge branch 'ls/no-double-utf8-author-name' of .....
blob
|
diff
|
raw
2017-11-28
Sync with v2.15.1
blob
|
diff
|
raw
2017-11-28
Merge branch 'ma/branch-list-paginate'
blob
|
diff
|
raw
2017-11-28
Merge branch 'jc/branch-name-sanity'
blob
|
diff
|
raw
2017-11-27
Sync with maint
blob
|
diff
|
raw
2017-11-27
Merge branch 'sw/pull-ipv46-passthru'
blob
|
diff
|
raw
2017-11-27
Merge branch 'ks/rebase-no-git-foo'
blob
|
diff
|
raw
2017-11-27
Merge branch 'rs/config-write-section-fix'
blob
|
diff
|
raw
2017-11-27
Merge branch 'ew/rebase-mboxrd'
blob
|
diff
|
raw
2017-11-27
Merge branch 'tb/add-renormalize'
blob
|
diff
|
raw
2017-11-27
Merge branch 'tz/complete-branch-copy'
blob
|
diff
|
raw
2017-11-27
Merge branch 'rs/apply-inaccurate-eof-with-incomplete...
blob
|
diff
|
raw
2017-11-27
Merge branch 'pw/sequencer-recover-from-unlockable...
blob
|
diff
|
raw
2017-11-27
Merge branch 'sd/branch-copy'
blob
|
diff
|
raw
2017-11-27
Merge branch 'sb/test-cherry-pick-submodule-getting...
blob
|
diff
|
raw
2017-11-27
Merge branch 'tz/notes-error-to-stderr'
blob
|
diff
|
raw
2017-11-27
Merge branch 'tz/redirect-fix'
blob
|
diff
|
raw
2017-11-27
Merge branch 'jc/merge-base-fork-point-doc'
blob
|
diff
|
raw
2017-11-27
Merge branch 'jc/ignore-cr-at-eol'
blob
|
diff
|
raw
2017-11-27
Merge branch 'rs/apply-fuzzy-match-fix' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-27
Merge branch 'rs/imap-send-next-arg-fix' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-22
Merge branch 'jn/reproducible-build' of ../git-gui...
blob
|
diff
|
raw
2017-11-21
Sync with maint
blob
|
diff
|
raw
2017-11-21
Merge branch 'rs/apply-fuzzy-match-fix'
blob
|
diff
|
raw
2017-11-21
Merge branch 'ad/submitting-patches-title-decoration'
blob
|
diff
|
raw
2017-11-21
Merge branch 'av/fsmonitor'
blob
|
diff
|
raw
2017-11-21
Merge branch 'bp/fsmonitor'
blob
|
diff
|
raw
2017-11-21
Merge branch 'cb/t4201-robustify' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-21
Merge branch 'ad/rebase-i-serie-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-21
Merge branch 'ab/pcre-v2' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-15
Sync with maint
blob
|
diff
|
raw
2017-11-15
Merge branch 'bp/read-index-from-skip-verification'
blob
|
diff
|
raw
2017-11-15
Merge branch 'bc/submitting-patches-in-asciidoc'
blob
|
diff
|
raw
2017-11-15
Merge branch 'jk/info-alternates-fix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'cb/t4201-robustify'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ab/pcre-v2'
blob
|
diff
|
raw
2017-11-15
Merge branch 'tz/fsf-address-update'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ad/rebase-i-serie-typofix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ab/mediawiki-namespace'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ma/reduce-heads-leakfix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'js/for-each-ref-remote-name-and-ref'
blob
|
diff
|
raw
2017-11-15
Merge branch 'cc/git-packet-pm'
blob
|
diff
|
raw
2017-11-15
Merge branch 'bw/rebase-i-ignored-submodule-fix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'mh/tidy-ref-update-flags'
blob
|
diff
|
raw
2017-11-15
Merge branch 'sr/wrapper-quote-filenames'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ma/bisect-leakfix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'rs/sequencer-rewrite-file-cleanup'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ao/merge-verbosity-getenv-just-once'
blob
|
diff
|
raw
2017-11-15
Merge branch 'mh/avoid-rewriting-packed-refs'
blob
|
diff
|
raw
2017-11-15
Merge branch 'rs/imap-send-next-arg-fix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ab/mediawiki-name-truncation'
blob
|
diff
|
raw
2017-11-15
Merge branch 'dk/libsecret-unlock-to-load-fix' into...
blob
|
diff
|
raw
|
diff to current
2017-11-15
Merge branch 'js/early-config' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-15
Merge branch 'ao/diff-populate-filespec-lstat-errorpath...
blob
|
diff
|
raw
|
diff to current
2017-11-15
Merge branch 'jc/check-ref-format-oor' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-15
Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-15
Merge branch 'js/submodule-in-excluded' into maint
blob
|
diff
|
raw
|
diff to current
2017-11-13
Merge branch 'jm/status-ignored-files-list'
blob
|
diff
|
raw
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
next