Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/switch-and-restore'
[gitweb.git]
/
git-merge-octopus.sh
2019-03-18
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2019-02-05
Merge branch 'cc/test-ref-store-typofix'
blob
|
diff
|
raw
2019-01-14
Merge branch 'hb/t0061-dot-in-path-fix'
blob
|
diff
|
raw
2018-11-21
Merge branch 'jk/check-everything-connected-is-long...
blob
|
diff
|
raw
2018-11-21
Merge branch 'np/log-graph-octopus-fix' into maint
blob
|
diff
|
raw
2018-10-31
Adjust for 2.19.x series
blob
|
diff
|
raw
2018-10-26
Merge branch 'np/log-graph-octopus-fix'
blob
|
diff
|
raw
2018-10-25
t0061: adjust to test-tool transition
blob
|
diff
|
raw
2018-10-16
Merge branch 'jk/check-everything-connected-is-long...
blob
|
diff
|
raw
2018-09-27
Sync with Git 2.14.4
blob
|
diff
|
raw
2018-08-27
Merge branch 'sg/t7501-thinkofix'
blob
|
diff
|
raw
2018-08-27
Merge branch 'sg/t0020-conversion-fix'
blob
|
diff
|
raw
2018-08-27
Merge branch 'sg/t4051-fix'
blob
|
diff
|
raw
2018-08-27
Merge branch 'js/larger-timestamps'
blob
|
diff
|
raw
2018-08-20
Merge branch 'nd/cherry-pick-quit-fix'
blob
|
diff
|
raw
2018-08-20
Merge branch 'sb/pull-rebase-submodule'
blob
|
diff
|
raw
2018-08-20
Merge branch 'js/typofixes'
blob
|
diff
|
raw
2018-08-15
Merge branch 'sb/histogram-less-memory'
blob
|
diff
|
raw
2018-08-15
Merge branch 'sg/fast-import-dump-refs-on-checkpoint...
blob
|
diff
|
raw
2018-08-02
Merge branch 'sg/httpd-test-unflake'
blob
|
diff
|
raw
2018-07-24
Merge branch 'jk/fetch-all-peeled-fix'
blob
|
diff
|
raw
2018-06-28
Merge branch 'jk/fetch-all-peeled-fix'
blob
|
diff
|
raw
2018-06-18
Merge branch 'ks/branch-set-upstream'
blob
|
diff
|
raw
2018-06-18
Merge branch 'mw/doc-merge-enumfix'
blob
|
diff
|
raw
2018-05-30
Merge branch 'rs/no-null-ptr-arith-in-fast-export'
blob
|
diff
|
raw
2018-05-23
Merge branch 'tb/test-apfs-utf8-normalization'
blob
|
diff
|
raw
2018-05-22
Sync with Git 2.14.4
blob
|
diff
|
raw
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
2018-05-08
Merge branch 'ab/git-svn-get-record-typofix'
blob
|
diff
|
raw
2018-05-08
Merge branch 'sg/doc-gc-quote-mismatch-fix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'es/fread-reads-dir-autoconf-fix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'js/t5404-path-fix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'mn/send-email-credential-doc'
blob
|
diff
|
raw
2018-04-25
Merge branch 'ak/bisect-doc-typofix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'bw/commit-partial-from-subdirectory-fix'
blob
|
diff
|
raw
2018-04-10
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-04-10
Merge branch 'jk/diff-highlight-graph-fix'
blob
|
diff
|
raw
2018-03-22
Merge branch 'sm/mv-dry-run-update' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'gs/test-unset-xdg-cache-home' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'sb/status-doc-fix' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'bc/doc-interpret-trailers-grammofix'...
blob
|
diff
|
raw
2018-03-22
Merge branch 'sg/doc-test-must-fail-args' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'nd/ignore-glob-doc-update' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'tz/doc-show-defaults-to-head' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'jc/mailinfo-cleanup-fix' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'rb/hashmap-h-compilation-fix' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'cl/t9001-cleanup' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'jt/fsck-code-cleanup' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'nd/diff-flush-before-warning' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'sg/travis-build-during-script-phase'...
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
2018-03-08
Merge branch 'mk/doc-pretty-fill'
blob
|
diff
|
raw
2018-03-08
Merge branch 'ds/mark-parents-uninteresting-optim'
blob
|
diff
|
raw
2018-03-08
Merge branch 'sg/travis-build-during-script-phase'
blob
|
diff
|
raw
2018-03-06
Merge branch 'xz/send-email-batch-size'
blob
|
diff
|
raw
2018-03-06
Merge branch 'sm/mv-dry-run-update'
blob
|
diff
|
raw
2018-03-06
Merge branch 'cb/ttk-style' of git-gui into cb/git...
blob
|
diff
|
raw
2018-03-02
Merge branch 'bb/ssh-key-files' of git-gui into bb...
blob
|
diff
|
raw
2018-03-02
Merge branch 'bp/bind-kp-enter' of git-gui into bp...
blob
|
diff
|
raw
2018-02-28
Merge branch 'tz/do-not-clean-spec-file'
blob
|
diff
|
raw
2018-02-28
Merge branch 'gs/test-unset-xdg-cache-home'
blob
|
diff
|
raw
2018-02-28
Merge branch 'tk/apply-dev-null-verify-name-fix'
blob
|
diff
|
raw
2018-02-28
Merge branch 'sb/status-doc-fix'
blob
|
diff
|
raw
2018-02-27
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-02-27
Merge branch 'nd/ita-wt-renames-in-status' into maint
blob
|
diff
|
raw
2018-02-27
Merge branch 'jk/sq-dequote-on-bogus-input'
blob
|
diff
|
raw
2018-02-27
Merge branch 'bc/doc-interpret-trailers-grammofix'
blob
|
diff
|
raw
2018-02-27
Merge branch 'sg/doc-test-must-fail-args'
blob
|
diff
|
raw
2018-02-27
Merge branch 'rs/check-ignore-multi'
blob
|
diff
|
raw
2018-02-27
Merge branch 'bp/name-hash-dirname-fix'
blob
|
diff
|
raw
2018-02-15
Merge branch 'as/read-tree-prefix-doc-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'jc/merge-symlink-ours-theirs' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'jm/svn-pushmergeinfo-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'nd/ignore-glob-doc-update'
blob
|
diff
|
raw
2018-02-15
Merge branch 'tg/reset-hard-show-head-with-pretty'
blob
|
diff
|
raw
2018-02-15
Merge branch 'sb/pull-rebase-submodule'
blob
|
diff
|
raw
2018-02-15
Merge branch 'jt/fsck-code-cleanup'
blob
|
diff
|
raw
2018-02-13
Merge branch 'tz/doc-show-defaults-to-head'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jc/mailinfo-cleanup-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'rs/strbuf-cocci-workaround'
blob
|
diff
|
raw
2018-02-13
Merge branch 'rb/hashmap-h-compilation-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'nd/diff-flush-before-warning'
blob
|
diff
|
raw
2018-02-13
Merge branch 'cl/t9001-cleanup'
blob
|
diff
|
raw
2018-01-23
Merge branch 'as/read-tree-prefix-doc-fix'
blob
|
diff
|
raw
2018-01-23
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-01-23
Merge branch 'jc/merge-symlink-ours-theirs'
blob
|
diff
|
raw
2018-01-23
Merge branch 'jm/svn-pushmergeinfo-fix'
blob
|
diff
|
raw
2018-01-23
Merge branch 'nd/ita-wt-renames-in-status'
blob
|
diff
|
raw
2018-01-11
Merge branch 'js/test-with-ws-in-path'
blob
|
diff
|
raw
2018-01-09
Merge branch 'jk/doc-diff-options'
blob
|
diff
|
raw
2018-01-09
Merge branch 'sg/travis-check-untracked'
blob
|
diff
|
raw
2018-01-09
Merge branch 'js/test-with-ws-in-path'
blob
|
diff
|
raw
2018-01-09
Merge branch 'sg/travis-skip-identical-test'
blob
|
diff
|
raw
2018-01-09
Merge branch 'sg/travis-fixes'
blob
|
diff
|
raw
2018-01-09
Merge branch 'js/misc-git-gui-stuff' of ../git-gui
blob
|
diff
|
raw
2018-01-05
Merge branch 'jh/memihash-opt'
blob
|
diff
|
raw
2017-12-28
Merge branch 'sr/http-sslverify-config-doc'
blob
|
diff
|
raw
2017-12-27
Merge branch 'sg/travis-fixes'
blob
|
diff
|
raw
next