Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge: detect delete/modechange conflict
[gitweb.git]
/
t
/
t3900-i18n-commit.sh
2015-01-12
Merge branch 'rw/apply-does-not-take-ignore-date' into...
blob
|
diff
|
raw
2014-11-18
Merge branch 'jc/doc-commit-only'
blob
|
diff
|
raw
2014-11-11
Merge branch 'rs/clean-menu-item-defn' into maint
blob
|
diff
|
raw
2014-11-06
Merge branch 'tm/line-log-first-parent'
blob
|
diff
|
raw
2014-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-10-29
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
diff
|
raw
2014-10-14
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
diff
|
raw
2014-09-30
Merge branch 'sb/merge-recursive-copy-paste-fix'
blob
|
diff
|
raw
2014-09-26
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
diff
|
raw
2014-09-09
Merge branch 'rs/clean-menu-item-defn'
blob
|
diff
|
raw
2014-08-10
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-06-27
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-06-26
Merge early parts from git://ozlabs.org/~paulus/gitk.git
blob
|
diff
|
raw
2014-06-26
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2014-06-25
Merge branch 'rr/rebase-autostash-fix' into maint
blob
|
diff
|
raw
2014-06-16
Merge branch 'rr/rebase-autostash-fix'
blob
|
diff
|
raw
2014-05-19
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
diff
|
raw
2014-04-09
Merge branch 'jk/commit-dates-parsing-fix' into maint
blob
|
diff
|
raw
2014-04-09
Merge commit 'doc/http-backend: missing accent grave...
blob
|
diff
|
raw
2014-04-08
Merge branch 'jk/commit-dates-parsing-fix'
blob
|
diff
|
raw
2014-03-31
Merge branch 'wt/doc-submodule-name-path-confusion-1'
blob
|
diff
|
raw
2014-03-18
Merge branch 'jk/commit-dates-parsing-fix' into maint
blob
|
diff
|
raw
2014-03-18
Merge branch 'jc/check-attr-honor-working-tree' into...
blob
|
diff
|
raw
2014-03-18
Merge branch 'jk/config-path-include-fix' into maint
blob
|
diff
|
raw
2014-03-18
Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
blob
|
diff
|
raw
2014-03-14
Merge branch 'jk/commit-dates-parsing-fix'
blob
|
diff
|
raw
2014-03-14
Merge branch 'jc/check-attr-honor-working-tree'
blob
|
diff
|
raw
2014-03-07
Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
blob
|
diff
|
raw
2014-03-07
Merge branch 'jc/core-checkstat-2.0'
blob
|
diff
|
raw
2014-03-07
Merge branch 'jc/add-2.0-ignore-removal'
blob
|
diff
|
raw
2014-03-07
Merge branch 'jn/add-2.0-u-A-sans-pathspec'
blob
|
diff
|
raw
2014-03-07
Merge branch 'jc/push-2.0-default-to-simple'
blob
|
diff
|
raw
2014-02-27
Merge branch 'bs/stdio-undef-before-redef'
blob
|
diff
|
raw
2014-02-27
Merge branch 'jk/config-path-include-fix'
blob
|
diff
|
raw
2014-02-13
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
2014-02-05
Merge branch 'jc/maint-pull-docfix' into maint
blob
|
diff
|
raw
2014-01-27
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
2014-01-27
Merge branch 'mh/attr-macro-doc'
blob
|
diff
|
raw
2014-01-27
Merge branch 'jc/maint-pull-docfix'
blob
|
diff
|
raw
2014-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-01-21
Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
2014-01-14
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
blob
|
diff
|
raw
|
diff to current
2014-01-13
Merge branch 'jk/t5531-prepare-to-default-to-non-matching'
blob
|
diff
|
raw
2013-12-17
Merge branch 'rs/doc-submitting-patches' into maint
blob
|
diff
|
raw
2013-12-17
Merge branch 'jk/two-way-merge-corner-case-fix' into...
blob
|
diff
|
raw
2013-12-17
Merge branch 'nd/magic-pathspec' into maint
blob
|
diff
|
raw
2013-12-12
Merge branch 'rs/doc-submitting-patches'
blob
|
diff
|
raw
2013-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2013-12-09
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-12-06
Merge branch 'nd/magic-pathspec'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jn/mediawiki-makefile-updates'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jk/two-way-merge-corner-case-fix'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jc/merge-base-reflog'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jk/replace-perl-in-built-scripts'
blob
|
diff
|
raw
2013-11-07
Merge branch 'vd/doc-unpack-objects' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'jk/subtree-install-fix' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'hn/log-graph-color-octopus' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'mm/checkout-auto-track-fix' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
2013-11-04
Merge branch 'vd/doc-unpack-objects'
blob
|
diff
|
raw
2013-11-04
Merge branch 'jk/duplicate-objects-in-packs'
blob
|
diff
|
raw
2013-11-04
Merge branch 'jk/subtree-install-fix'
blob
|
diff
|
raw
2013-11-04
Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
blob
|
diff
|
raw
2013-11-01
Merge branch 'rs/web-browse-xdg-open'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/refs-c-squelch-gcc'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/date-c-double-semicolon'
blob
|
diff
|
raw
2013-10-30
Merge branch 'nd/magic-pathspec'
blob
|
diff
|
raw
2013-10-30
Merge branch 'nd/gc-lock-against-each-other'
blob
|
diff
|
raw
2013-10-30
Merge branch 'hn/log-graph-color-octopus'
blob
|
diff
|
raw
2013-10-30
Merge branch 'mm/checkout-auto-track-fix'
blob
|
diff
|
raw
2013-10-30
Merge branch 'sg/t3600-nul-sha1-fix'
blob
|
diff
|
raw
2013-10-28
Merge branch 'ew/keepalive'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jx/relative-path-regression-fix'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/format-patch-from' into maint
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/shortlog-tolerate-broken-commit' into...
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/diff-algo' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'jc/ls-files-killed-optim' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'jh/checkout-auto-tracking' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'hu/cherry-pick-previous-branch'
blob
|
diff
|
raw
2013-10-23
Merge branch 'mg/more-textconv'
blob
|
diff
|
raw
2013-10-23
Merge branch 'jc/pack-objects'
blob
|
diff
|
raw
2013-10-18
Merge branch 'jc/reflog-doc'
blob
|
diff
|
raw
2013-10-17
Merge branch 'jk/format-patch-from'
blob
|
diff
|
raw
2013-10-17
Merge branch 'jk/upload-pack-keepalive' into maint
blob
|
diff
|
raw
2013-10-17
Merge branch 'bc/http-backend-allow-405' into maint
blob
|
diff
|
raw
2013-10-17
Merge branch 'jc/cvsserver-perm-bit-fix' into maint
blob
|
diff
|
raw
2013-10-17
Merge branch 'nd/git-dir-pointing-at-gitfile' into...
blob
|
diff
|
raw
2013-10-17
Merge branch 'es/rebase-i-respect-core-commentchar...
blob
|
diff
|
raw
2013-10-14
Merge branch 'rj/highlight-test-hang'
blob
|
diff
|
raw
2013-10-14
Merge branch 'nv/doc-config-signingkey'
blob
|
diff
|
raw
2013-10-14
Merge branch 'nd/clone-local-with-colon'
blob
|
diff
|
raw
2013-10-14
Merge branch 'jx/clean-interactive'
blob
|
diff
|
raw
2013-10-14
Merge branch 'jk/diff-algo'
blob
|
diff
|
raw
2013-10-08
Merge branch 'tz/credential-netrc'
blob
|
diff
|
raw
2013-09-26
Merge branch 'mm/rebase-continue-freebsd-WB' into maint
blob
|
diff
|
raw
2013-09-26
Merge branch 'km/svn-1.8-serf-only' into maint
blob
|
diff
|
raw
2013-09-26
Merge branch 'js/xread-in-full' into maint
blob
|
diff
|
raw
2013-09-26
Merge branch 'bc/send-email-ssl-die-message-fix' into...
blob
|
diff
|
raw
2013-09-25
Merge branch 'jk/shortlog-tolerate-broken-commit'
blob
|
diff
|
raw
next