Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
dir.c: mark more strings for translation
[gitweb.git]
/
Documentation
/
git-merge.txt
2018-06-28
Merge branch 'sb/fix-fetching-moved-submodules'
blob
|
diff
|
raw
2018-06-28
Merge branch 'tz/cred-netrc-cleanup'
blob
|
diff
|
raw
2018-06-28
Merge branch 'jc/clean-after-sanity-tests'
blob
|
diff
|
raw
2018-06-28
Merge branch 'nd/completion-negation'
blob
|
diff
|
raw
2018-06-28
Merge branch 'pw/add-p-recount'
blob
|
diff
|
raw
2018-06-28
Merge branch 'jk/fetch-all-peeled-fix'
blob
|
diff
|
raw
2018-06-28
Merge branch 'ms/send-pack-honor-config'
blob
|
diff
|
raw
2018-06-28
Merge branch 'jh/partial-clone'
blob
|
diff
|
raw
2018-06-28
Merge branch 'sg/gpg-tests-fix'
blob
|
diff
|
raw
2018-06-28
Merge branch 'as/safecrlf-quiet-fix'
blob
|
diff
|
raw
2018-06-28
Merge branch 'ab/refspec-init-fix'
blob
|
diff
|
raw
2018-06-25
Merge branch 'sb/plug-misc-leaks'
blob
|
diff
|
raw
2018-06-25
Merge branch 'cc/tests-without-assuming-ref-files-backend'
blob
|
diff
|
raw
2018-06-25
Merge branch 'sg/update-ref-stdin-cleanup'
blob
|
diff
|
raw
2018-06-25
Merge branch 'nd/reject-empty-shallow-request'
blob
|
diff
|
raw
2018-06-25
Merge branch 'ls/complete-remote-update-names'
blob
|
diff
|
raw
2018-06-25
Merge branch 'ag/rebase-p'
blob
|
diff
|
raw
2018-06-25
Merge branch 'nd/complete-config-vars'
blob
|
diff
|
raw
2018-06-25
Merge branch 'sb/object-store-alloc'
blob
|
diff
|
raw
2018-06-25
Merge branch 'jk/show-index'
blob
|
diff
|
raw
2018-06-25
Merge branch 'en/merge-recursive-tests'
blob
|
diff
|
raw
2018-06-25
Merge branch 'nd/diff-apply-ita'
blob
|
diff
|
raw
2018-06-25
Merge branch 'ds/commit-graph-lockfile-fix'
blob
|
diff
|
raw
2018-06-25
Merge branch 'nd/commit-util-to-slab'
blob
|
diff
|
raw
2018-06-25
Merge branch 'pc/submodule-helper-foreach'
blob
|
diff
|
raw
2018-06-19
Merge branch 'en/rename-directory-detection-reboot'
blob
|
diff
|
raw
2018-06-19
Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com...
blob
|
diff
|
raw
2018-06-19
Merge branch 'cf/submodule-progress-dissociate'
blob
|
diff
|
raw
2018-06-19
Merge branch 'js/rebase-i-root-fix'
blob
|
diff
|
raw
2018-06-18
Merge branch 'es/make-no-iconv'
blob
|
diff
|
raw
2018-06-18
Merge branch 'sg/t7406-chain-fix'
blob
|
diff
|
raw
2018-06-18
Merge branch 'ks/branch-set-upstream'
blob
|
diff
|
raw
2018-06-18
Merge branch 'js/rebase-i-root-fix'
blob
|
diff
|
raw
2018-06-18
Merge branch 'jk/ewah-bounds-check'
blob
|
diff
|
raw
2018-06-18
Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git...
blob
|
diff
|
raw
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 '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-06-14
doc: update the order of the syntax `git merge --continue`
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
Sync with Git 2.14.4
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 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
2018-04-25
Merge branch 'ak/bisect-doc-typofix'
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-10
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
|
diff to current
2018-04-10
Merge branch 'jk/diff-highlight-graph-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-09
Merge branch 'tg/stash-untracked-with-pathspec-fix'
blob
|
diff
|
raw
|
diff to current
2018-03-29
Merge branch 'jh/partial-clone'
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'sm/mv-dry-run-update' 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 'ml/filter-branch-portability-fix'
blob
|
diff
|
raw
|
diff to current
2018-03-21
Merge branch 'dp/merge-strategy-doc-fix'
blob
|
diff
|
raw
|
diff to current
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-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 '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
next