Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Sync with 2.2.2
[gitweb.git]
/
mergetools
/
kdiff3
2013-06-26
Merge branch 'kb/diff-blob-blob-doc'
blob
|
diff
|
raw
2013-06-26
Merge branch 'mm/push-force-is-dangerous'
blob
|
diff
|
raw
2013-06-24
Merge branch 'rr/am-quit-empty-then-abort-fix'
blob
|
diff
|
raw
2013-06-24
Merge branch 'nk/config-local-doc'
blob
|
diff
|
raw
2013-06-24
Merge branch 'dk/version-gen-gitdir'
blob
|
diff
|
raw
2013-06-24
Merge branch 'dk/maint-t5150-dirname'
blob
|
diff
|
raw
2013-06-23
Merge branch 'rr/rebase-autostash'
blob
|
diff
|
raw
2013-06-17
Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2013-06-11
Merge branch 'rr/maint-fetch-tag-doc-asterisks'
blob
|
diff
|
raw
2013-06-11
Merge branch 'rr/rebase-autostash'
blob
|
diff
|
raw
2013-06-11
Merge branch 'jk/test-exit-code-by-signal'
blob
|
diff
|
raw
2013-06-11
Merge branch 'fc/at-head'
blob
|
diff
|
raw
2013-06-11
Merge branch 'nd/warn-ambiguous-object-name'
blob
|
diff
|
raw
2013-06-11
Merge branch 'cr/git-work-tree-sans-git-dir'
blob
|
diff
|
raw
2013-06-11
Merge branch 'cb/log-follow-with-combined'
blob
|
diff
|
raw
2013-06-11
Merge branch 'fc/do-not-use-the-index-in-add-to-index'
blob
|
diff
|
raw
2013-06-11
Merge branch 'rj/mingw-cygwin'
blob
|
diff
|
raw
2013-06-11
Merge branch 'tr/test-commit-only-on-orphan'
blob
|
diff
|
raw
2013-06-10
Merge branch 'jn/config-ignore-inaccessible' into maint
blob
|
diff
|
raw
2013-06-10
Merge branch 'kb/status-ignored-optim-2' into maint
blob
|
diff
|
raw
2013-06-07
Merge branch 'js/transport-helper-error-reporting-fix...
blob
|
diff
|
raw
2013-06-05
Merge branch 'th/bisect-skip-report-range-fix'
blob
|
diff
|
raw
2013-06-05
Merge branch 'jc/core-checkstat'
blob
|
diff
|
raw
2013-06-03
Merge branch 'kb/status-ignored-optim-2'
blob
|
diff
|
raw
2013-06-02
Merge branch 'tr/line-log'
blob
|
diff
|
raw
2013-06-02
Merge branch 'mk/combine-diff-context-horizon-fix'
blob
|
diff
|
raw
2013-06-02
Merge branch 'fc/macos-x-clipped-write'
blob
|
diff
|
raw
2013-06-02
Merge branch 'vv/help-unknown-ref'
blob
|
diff
|
raw
2013-06-02
Merge branch 'nd/clone-local-with-colon'
blob
|
diff
|
raw
2013-06-02
Merge branch 'fc/fast-export-persistent-marks'
blob
|
diff
|
raw
2013-06-02
Merge branch 'fc/completion'
blob
|
diff
|
raw
2013-06-02
Merge branch 'fc/zsh-leftover-bits'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jn/config-ignore-inaccessible'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jk/lookup-object-prefer-latest'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jk/subtree-do-not-push-if-split-fails'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jk/test-output'
blob
|
diff
|
raw
2013-05-29
Merge branch 'rj/sparse'
blob
|
diff
|
raw
2013-05-29
Merge branch 'mh/packed-refs-various'
blob
|
diff
|
raw
2013-05-29
Merge branch 'as/check-ignore'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jh/checkout-auto-tracking'
blob
|
diff
|
raw
2013-05-29
Merge branch 'jc/prune-all'
blob
|
diff
|
raw
2013-05-29
Merge branch 'mh/fetch-into-shallow'
blob
|
diff
|
raw
2013-05-29
Merge branch 'js/transport-helper-error-reporting-fix'
blob
|
diff
|
raw
2013-05-29
Merge branch 'fc/transport-helper-error-reporting'
blob
|
diff
|
raw
2013-05-17
Merge branch 'fc/doc-style'
blob
|
diff
|
raw
2013-05-17
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-05-13
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2013-05-11
Merge git://git.bogomips.org/git-svn
blob
|
diff
|
raw
2013-05-09
Sync with v1.8.2.3
blob
|
diff
|
raw
2013-05-09
Merge branch 'tr/copy-revisions-from-stdin' into maint
blob
|
diff
|
raw
2013-05-09
mergetools/kdiff3: do not use --auto when diffing
blob
|
diff
|
raw
2013-04-03
Merge branch 'jk/checkout-attribute-lookup' into maint...
blob
|
diff
|
raw
|
diff to current
2013-04-03
Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
blob
|
diff
|
raw
|
diff to current
2013-04-03
Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1
blob
|
diff
|
raw
|
diff to current
2013-04-01
Merge branch 'ap/maint-diff-rename-avoid-overlap' into...
blob
|
diff
|
raw
|
diff to current
2013-03-28
Merge branch 'jc/remove-treesame-parent-in-simplify...
blob
|
diff
|
raw
|
diff to current
2013-03-28
Merge branch 'jk/checkout-attribute-lookup'
blob
|
diff
|
raw
|
diff to current
2013-03-26
Merge branch 'ob/imap-send-ssl-verify' into maint
blob
|
diff
|
raw
|
diff to current
2013-03-25
Merge branch 'ap/maint-diff-rename-avoid-overlap'
blob
|
diff
|
raw
|
diff to current
2013-03-21
Merge branch 'ob/imap-send-ssl-verify'
blob
|
diff
|
raw
|
diff to current
2013-02-20
Merge branch 'ob/imap-send-ssl-verify' into maint
blob
|
diff
|
raw
|
diff to current
2013-02-04
Merge branch 'dl/am-hg-locale' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-01-28
Merge branch 'dl/am-hg-locale'
blob
|
diff
|
raw
|
diff to current
2013-01-23
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2013-01-14
Merge branch 'jk/maint-fast-import-doc-reorder' into...
blob
|
diff
|
raw
|
diff to current
2013-01-14
Merge branch 'jk/shortlog-no-wrap-doc' into maint
blob
|
diff
|
raw
|
diff to current
2013-01-14
Merge branch 'jk/maint-fast-import-doc-dedup-done'...
blob
|
diff
|
raw
|
diff to current
2013-01-14
Merge branch 'jl/interrupt-clone-remove-separate-git...
blob
|
diff
|
raw
|
diff to current
2013-01-12
Merge branch 'jk/maint-fast-import-doc-reorder'
blob
|
diff
|
raw
|
diff to current
2013-01-12
Merge branch 'jk/shortlog-no-wrap-doc'
blob
|
diff
|
raw
|
diff to current
2013-01-10
Merge branch 'ta/remove-stale-translated-tut' into...
blob
|
diff
|
raw
|
diff to current
2013-01-10
Merge branch 'jl/interrupt-clone-remove-separate-git...
blob
|
diff
|
raw
|
diff to current
2013-01-08
Merge branch 'ta/remove-stale-translated-tut'
blob
|
diff
|
raw
|
diff to current
2013-01-08
Merge branch 'jk/maint-fast-import-doc-dedup-done'
blob
|
diff
|
raw
|
diff to current
2012-10-17
Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2012-10-08
Merge branch 'os/commit-submodule-ignore' into maint
blob
|
diff
|
raw
|
diff to current
2012-10-01
Merge branch 'os/commit-submodule-ignore'
blob
|
diff
|
raw
|
diff to current
2012-09-18
Merge branch 'er/doc-fast-import-done' into maint
blob
|
diff
|
raw
|
diff to current
2012-09-15
Merge branch 'da/gitk-reload-tag-contents' into maint...
blob
|
diff
|
raw
|
diff to current
2012-09-12
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2012-09-12
Merge branch 'da/gitk-reload-tag-contents'
blob
|
diff
|
raw
|
diff to current
2012-09-11
Merge branch 'jc/maint-t7406-rev-parse-max-count-huh...
blob
|
diff
|
raw
|
diff to current
2012-09-11
Merge branch 'nd/index-errno' into maint-1.7.11
blob
|
diff
|
raw
|
diff to current
2012-09-11
Merge branch 'pg/maint-apply-remove-unused-variable...
blob
|
diff
|
raw
|
diff to current
2012-08-27
Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'
blob
|
diff
|
raw
|
diff to current
2012-08-24
Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11
blob
|
diff
|
raw
|
diff to current
2012-08-22
Merge branch 'nd/index-errno'
blob
|
diff
|
raw
|
diff to current
2012-08-22
Merge branch 'pg/maint-apply-remove-unused-variable'
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'jn/block-sha1' into maint
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'ms/daemon-doc-typo' into maint
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'lm/git-blame-el' into maint
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'rs/git-blame-mapcar-mapc' into maint
blob
|
diff
|
raw
|
diff to current
2012-08-06
Merge branch 'jk/maint-checkout-orphan-check-fix' into...
blob
|
diff
|
raw
|
diff to current
2012-07-28
Merge branch 'jk/maint-checkout-orphan-check-fix'
blob
|
diff
|
raw
|
diff to current
2012-07-24
Merge branch 'jn/block-sha1'
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'jk/maint-commit-amend-only-no-paths'...
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'tg/maint-cache-name-compare' into maint
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'jc/refactor-diff-stdin' into maint
blob
|
diff
|
raw
|
diff to current
2012-07-22
Merge branch 'cw/no-detaching-an-unborn' into maint
blob
|
diff
|
raw
|
diff to current
next