Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
unpack-trees: do not fail reset because of unmerged skipped entry
[gitweb.git]
/
git-merge-one-file.sh
2018-06-19
Merge branch 'en/rename-directory-detection-reboot'
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 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 'ma/unpack-trees-free-msgs'
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 'rs/no-null-ptr-arith-in-fast-export'
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 'ab/git-svn-get-record-typofix'
blob
|
diff
|
raw
|
diff to current
2018-05-02
merge-one-file: compute empty blob object ID
blob
|
diff
|
raw
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-10
Merge branch 'ys/bisect-object-id-missing-conversion...
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 'bc/doc-interpret-trailers-grammofix'...
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 'cl/t9001-cleanup' 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 '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 '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-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 'sg/travis-build-during-script-phase'
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 '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 '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 'bc/doc-interpret-trailers-grammofix'
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 'as/read-tree-prefix-doc-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'tg/reset-hard-show-head-with-pretty'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'sb/pull-rebase-submodule'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'jt/fsck-code-cleanup'
blob
|
diff
|
raw
|
diff to current
2018-02-13
Merge branch 'jc/mailinfo-cleanup-fix'
blob
|
diff
|
raw
|
diff to current
2018-02-13
Merge branch 'nd/diff-flush-before-warning'
blob
|
diff
|
raw
|
diff to current
2018-02-13
Merge branch 'cl/t9001-cleanup'
blob
|
diff
|
raw
|
diff to current
2018-01-23
Merge branch 'as/read-tree-prefix-doc-fix'
blob
|
diff
|
raw
|
diff to current
2018-01-23
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
|
diff to current
2018-01-23
Merge branch 'nd/ita-wt-renames-in-status'
blob
|
diff
|
raw
|
diff to current
next