Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Doc: fix misleading asciidoc formating
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2018-04-25
Merge branch 'ak/bisect-doc-typofix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'nd/worktree-move'
blob
|
diff
|
raw
2018-04-25
Merge branch 'jk/t5561-missing-curl'
blob
|
diff
|
raw
2018-04-25
Merge branch 'bw/commit-partial-from-subdirectory-fix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'jk/flockfile-stdio'
blob
|
diff
|
raw
2018-04-25
Merge branch 'pw/rebase-signoff'
blob
|
diff
|
raw
2018-04-25
Merge branch 'pw/rebase-keep-empty-fixes'
blob
|
diff
|
raw
2018-04-25
Merge branch 'cb/git-gui-ttk-style'
blob
|
diff
|
raw
2018-04-25
Merge branch 'bp/git-gui-bind-kp-enter'
blob
|
diff
|
raw
2018-04-25
Merge branch 'bb/git-gui-ssh-key-files'
blob
|
diff
|
raw
2018-04-24
Merge branch 'bw/protocol-v2' into HEAD
blob
|
diff
|
raw
2018-04-15
Merge branch 'master' of https://github.com/ralfth...
blob
|
diff
|
raw
2018-04-11
Merge branch 'eb/cred-helper-ignore-sigpipe'
blob
|
diff
|
raw
2018-04-11
Merge branch 'lv/tls-1.3'
blob
|
diff
|
raw
2018-04-11
Merge branch 'pk/test-avoid-pipe-hiding-exit-status'
blob
|
diff
|
raw
2018-04-11
Merge branch 'rs/status-with-removed-submodule'
blob
|
diff
|
raw
2018-04-11
Merge branch 'sb/packfiles-in-repository'
blob
|
diff
|
raw
2018-04-11
Merge branch 'sb/object-store'
blob
|
diff
|
raw
2018-04-11
Merge branch 'jc/test-must-be-empty'
blob
|
diff
|
raw
2018-04-10
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-04-10
Merge branch 'yk/filter-branch-non-committish-refs'
blob
|
diff
|
raw
2018-04-10
Merge branch 'nd/trace-with-env'
blob
|
diff
|
raw
2018-04-10
Merge branch 'nd/parseopt-completion-more'
blob
|
diff
|
raw
2018-04-10
Merge branch 'ds/bsearch-hash'
blob
|
diff
|
raw
2018-04-10
Merge branch 'jk/diff-highlight-graph-fix'
blob
|
diff
|
raw
2018-04-10
Merge branch 'nd/remove-ignore-env-field'
blob
|
diff
|
raw
2018-04-10
Merge branch 'ps/contains-id-error-message'
blob
|
diff
|
raw
2018-04-09
Merge branch 'tg/stash-untracked-with-pathspec-fix'
blob
|
diff
|
raw
2018-04-09
Merge branch 'nd/worktree-prune'
blob
|
diff
|
raw
2018-04-09
Merge branch 'bc/object-id'
blob
|
diff
|
raw
2018-04-09
Merge branch 'ma/shortlog-revparse'
blob
|
diff
|
raw
2018-04-09
Merge branch 'ab/install-symlinks'
blob
|
diff
|
raw
2018-04-09
Merge branch 'ml/filter-branch-no-op-error'
blob
|
diff
|
raw
2018-04-09
Merge branch 'ab/pcre-v2'
blob
|
diff
|
raw
2018-04-09
Merge branch 'ti/fetch-everything-local-optim'
blob
|
diff
|
raw
2018-04-09
Merge branch 'en/rename-directory-detection'
blob
|
diff
|
raw
2018-04-02
Merge tag 'l10n-2.17.0-rnd1' of git://github.com/git...
blob
|
diff
|
raw
2018-04-02
Merge branch 'pw/add-p-single'
blob
|
diff
|
raw
2018-03-29
Merge branch 'jh/partial-clone'
blob
|
diff
|
raw
2018-03-28
Merge branch 'tg/stash-doc-typofix'
blob
|
diff
|
raw
2018-03-28
Merge branch 'pc/submodule-helper'
blob
|
diff
|
raw
2018-03-28
Merge branch 'nd/parseopt-completion'
blob
|
diff
|
raw
2018-03-22
Sync with Git 2.16.3
blob
|
diff
|
raw
2018-03-22
Merge branch 'sm/mv-dry-run-update' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'tg/worktree-create-tracking' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'gs/test-unset-xdg-cache-home' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'sb/status-doc-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'bp/fsmonitor' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'bc/doc-interpret-trailers-grammofix'...
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'sg/doc-test-must-fail-args' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'nd/ignore-glob-doc-update' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'tz/doc-show-defaults-to-head' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'jc/mailinfo-cleanup-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'rb/hashmap-h-compilation-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'cl/t9001-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'bw/oidmap-autoinit' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'jt/fsck-code-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'tg/split-index-fixes' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'mr/packed-ref-store-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'nd/diff-flush-before-warning' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'sg/travis-build-during-script-phase'...
blob
|
diff
|
raw
|
diff to current
2018-03-21
Merge branch 'jk/attributes-path-doc'
blob
|
diff
|
raw
2018-03-21
Merge branch 'rj/warning-uninitialized-fix'
blob
|
diff
|
raw
2018-03-21
Merge branch 'tz/complete-tag-delete-tagname'
blob
|
diff
|
raw
2018-03-21
Merge branch 'ml/filter-branch-portability-fix'
blob
|
diff
|
raw
2018-03-21
Merge branch 'js/ming-strftime'
blob
|
diff
|
raw
2018-03-21
Merge branch 'dp/merge-strategy-doc-fix'
blob
|
diff
|
raw
2018-03-21
Merge branch 'ks/t3200-typofix'
blob
|
diff
|
raw
|
diff to current
2018-03-21
Merge branch 'jh/fsck-promisors'
blob
|
diff
|
raw
|
diff to current
2018-03-21
Merge branch 'master' of https://github.com/Softcatala...
blob
|
diff
|
raw
|
diff to current
2018-03-19
Documentation/merge-strategies: typofix
blob
|
diff
|
raw
|
diff to current
2018-03-13
Merge branch 'jt/binsearch-with-fanout' into HEAD
blob
|
diff
|
raw
|
diff to current
2018-03-08
Merge branch 'mk/doc-pretty-fill'
blob
|
diff
|
raw
|
diff to current
2018-03-08
Merge branch 'ds/mark-parents-uninteresting-optim'
blob
|
diff
|
raw
|
diff to current
2018-03-08
Merge branch 'ds/find-unique-abbrev-optim'
blob
|
diff
|
raw
|
diff to current
2018-03-08
Merge branch 'sg/travis-build-during-script-phase'
blob
|
diff
|
raw
|
diff to current
2018-03-06
Merge branch 'rs/strbuf-read-file-or-whine'
blob
|
diff
|
raw
|
diff to current
2018-03-06
Merge branch 'xz/send-email-batch-size'
blob
|
diff
|
raw
|
diff to current
2018-03-06
Merge branch 'sm/mv-dry-run-update'
blob
|
diff
|
raw
|
diff to current
2018-03-06
Merge branch 'cb/ttk-style' of git-gui into cb/git...
blob
|
diff
|
raw
|
diff to current
2018-03-02
Merge branch 'bb/ssh-key-files' of git-gui into bb...
blob
|
diff
|
raw
|
diff to current
2018-03-02
Merge branch 'bp/bind-kp-enter' of git-gui into bp...
blob
|
diff
|
raw
|
diff to current
2018-02-28
Merge branch 'tz/do-not-clean-spec-file'
blob
|
diff
|
raw
|
diff to current
2018-02-28
Merge branch 'tg/worktree-create-tracking'
blob
|
diff
|
raw
|
diff to current
2018-02-28
Merge branch 'gs/test-unset-xdg-cache-home'
blob
|
diff
|
raw
|
diff to current
2018-02-28
Merge branch 'tk/apply-dev-null-verify-name-fix'
blob
|
diff
|
raw
|
diff to current
2018-02-28
Merge branch 'sb/status-doc-fix'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'nd/ita-wt-renames-in-status' into maint
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jt/binsearch-with-fanout'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jk/test-hashmap-updates'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jk/sq-dequote-on-bogus-input'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'bp/fsmonitor'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'bc/doc-interpret-trailers-grammofix'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'sg/doc-test-must-fail-args'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'sb/describe-blob'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'rs/check-ignore-multi'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'bp/name-hash-dirname-fix'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'ab/doc-cat-file-e-still-shows-errors...
blob
|
diff
|
raw
|
diff to current
next