Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ds/commit-graph-leakfix'
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2018-06-18
Merge branch 'sb/blame-color'
blob
|
diff
|
raw
2018-06-18
Merge branch 'mw/doc-merge-enumfix'
blob
|
diff
|
raw
2018-06-18
Merge branch 'en/rename-directory-detection'
blob
|
diff
|
raw
2018-06-18
Merge branch 'rd/doc-remote-tracking-with-hyphen'
blob
|
diff
|
raw
2018-06-18
Merge branch 'jl/zlib-restore-nul-termination'
blob
|
diff
|
raw
2018-06-18
Merge branch 'ab/cred-netrc-no-autodie'
blob
|
diff
|
raw
2018-06-18
Merge branch 'km/doc-workflows-typofix'
blob
|
diff
|
raw
2018-06-18
Merge branch 'ld/git-p4-updates'
blob
|
diff
|
raw
2018-06-18
Merge branch 'rd/diff-options-typofix'
blob
|
diff
|
raw
2018-06-18
Merge branch 'rd/comment-typofix-in-sha1-file'
blob
|
diff
|
raw
2018-06-13
Merge branch 'jk/index-pack-maint'
blob
|
diff
|
raw
2018-06-13
Merge branch 'sg/completion-zsh-workaround'
blob
|
diff
|
raw
2018-06-13
Merge branch 'sb/submodule-merge-in-merge-recursive'
blob
|
diff
|
raw
2018-06-13
Merge branch 'jk/submodule-fsck-loose-fixup'
blob
|
diff
|
raw
2018-06-04
Merge branch 'bc/t3430-fixup'
blob
|
diff
|
raw
2018-06-04
Merge branch 'bw/refspec-api'
blob
|
diff
|
raw
2018-06-04
Merge branch 'tg/doc-sec-list'
blob
|
diff
|
raw
2018-06-04
Merge branch 'rd/p4-doc-markup-env'
blob
|
diff
|
raw
2018-06-04
Merge branch 'nd/remote-update-doc'
blob
|
diff
|
raw
2018-06-04
Merge branch 'jt/submodule-pull-recurse-rebase'
blob
|
diff
|
raw
2018-06-01
Merge branch 'bw/ref-prefix-for-configured-refspec'
blob
|
diff
|
raw
2018-06-01
Merge branch 'cc/tests-without-assuming-ref-files-backend'
blob
|
diff
|
raw
2018-06-01
Merge branch 'rd/init-typo'
blob
|
diff
|
raw
2018-06-01
Merge branch 'js/rebase-recreate-merge'
blob
|
diff
|
raw
2018-06-01
Merge branch 'rd/tag-doc-lightweight'
blob
|
diff
|
raw
2018-06-01
Merge branch 'rd/doc-options-placeholder'
blob
|
diff
|
raw
2018-06-01
Merge branch 'en/rev-parse-invalid-range'
blob
|
diff
|
raw
2018-06-01
Merge branch 'ld/p4-unshelve'
blob
|
diff
|
raw
2018-06-01
Merge branch 'nd/use-opt-int-set-f'
blob
|
diff
|
raw
2018-06-01
Merge branch 'pa/import-tars-long-names'
blob
|
diff
|
raw
2018-06-01
Merge branch 'nd/command-list'
blob
|
diff
|
raw
2018-05-31
Merge remote-tracking branch 'git-po/maint'
blob
|
diff
|
raw
2018-05-30
Merge branch 'bw/remote-curl-compressed-responses'
blob
|
diff
|
raw
2018-05-30
Merge branch 'bc/hash-independent-tests'
blob
|
diff
|
raw
2018-05-30
Merge branch 'ma/regex-no-regfree-after-comp-fail'
blob
|
diff
|
raw
2018-05-30
Merge branch 'ma/config-store-data-clear'
blob
|
diff
|
raw
2018-05-30
Merge branch 'jk/snprintf-truncation'
blob
|
diff
|
raw
2018-05-30
Merge branch 'jk/config-blob-sans-repo'
blob
|
diff
|
raw
2018-05-30
Merge branch 'sb/submodule-merge-in-merge-recursive'
blob
|
diff
|
raw
2018-05-30
Merge branch 'js/empty-config-section-fix'
blob
|
diff
|
raw
2018-05-30
Merge branch 'bw/ref-prefix-for-configured-refspec'
blob
|
diff
|
raw
2018-05-30
Merge branch 'sb/grep-die-on-unreadable-index'
blob
|
diff
|
raw
2018-05-30
Merge branch 'sb/submodule-update-try-harder'
blob
|
diff
|
raw
2018-05-30
Merge branch 'lm/credential-netrc'
blob
|
diff
|
raw
2018-05-30
Merge branch 'ab/get-short-oid'
blob
|
diff
|
raw
2018-05-30
Merge branch 'jt/partial-clone-proto-v2'
blob
|
diff
|
raw
2018-05-30
Merge branch 'bc/object-id'
blob
|
diff
|
raw
2018-05-30
Merge branch 'sb/blame-color'
blob
|
diff
|
raw
2018-05-30
Merge branch 'cf/submodule-progress-dissociate'
blob
|
diff
|
raw
2018-05-30
Merge branch 'sg/complete-paths'
blob
|
diff
|
raw
2018-05-30
Merge branch 'nd/travis-gcc-8'
blob
|
diff
|
raw
2018-05-30
Merge branch 'nd/pack-struct-commit'
blob
|
diff
|
raw
2018-05-30
Merge branch 'ma/create-pseudoref-with-null-old-oid'
blob
|
diff
|
raw
2018-05-30
Merge branch 'jk/unavailable-can-be-missing'
blob
|
diff
|
raw
2018-05-30
Merge branch 'bp/status-rename-config'
blob
|
diff
|
raw
2018-05-30
Merge branch 'js/use-bug-macro'
blob
|
diff
|
raw
2018-05-30
Merge branch 'rs/no-null-ptr-arith-in-fast-export'
blob
|
diff
|
raw
2018-05-30
Merge branch 'nd/repo-clear-keep-the-index'
blob
|
diff
|
raw
2018-05-30
Merge branch 'ma/lockfile-cleanup'
blob
|
diff
|
raw
2018-05-30
Merge branch 'sg/t6500-no-redirect-of-stdin'
blob
|
diff
|
raw
2018-05-30
Merge branch 'bp/merge-rename-config'
blob
|
diff
|
raw
2018-05-23
Merge branch 'tb/test-apfs-utf8-normalization'
blob
|
diff
|
raw
|
diff to current
2018-05-23
Merge branch 'tg/worktree-add-existing-branch'
blob
|
diff
|
raw
|
diff to current
2018-05-23
Merge branch 'ds/lazy-load-trees'
blob
|
diff
|
raw
|
diff to current
2018-05-23
Merge branch 'sg/t7005-spaces-in-filenames-cleanup'
blob
|
diff
|
raw
|
diff to current
2018-05-22
Sync with Git 2.16.4
blob
|
diff
|
raw
|
diff to current
2018-05-22
Sync with Git 2.15.2
blob
|
diff
|
raw
|
diff to current
2018-05-22
Sync with Git 2.13.7
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: add merge.renames config setting
blob
|
diff
|
raw
2018-05-08
Merge branch 'jc/parseopt-expiry-errors'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ma/fast-export-skip-merge-fix'
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-05-08
Merge branch 'ls/checkout-encoding'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ab/nuke-emacs-contrib'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'nd/warn-more-for-devs'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ds/commit-graph'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'js/empty-config-section-fix'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'sb/submodule-move-nested'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ab/simplify-perl-makefile'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'bw/protocol-v2'
blob
|
diff
|
raw
|
diff to current
2018-05-02
Merge branch 'bw/protocol-v2' into jt/partial-clone...
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/worktree-docs'
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 'ps/test-chmtime-get'
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 'en/doc-typoes'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'lw/daemon-log-destination'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'mn/send-email-credential-doc'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'ak/bisect-doc-typofix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'nd/worktree-move'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'jk/t5561-missing-curl'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'bw/commit-partial-from-subdirectory-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'jk/flockfile-stdio'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'pw/rebase-signoff'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'pw/rebase-keep-empty-fixes'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'cb/git-gui-ttk-style'
blob
|
diff
|
raw
|
diff to current
next