Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ja/maint-pull-rebase-doc' into maint
[gitweb.git]
/
Documentation
/
git-mergetool--lib.txt
2010-12-14
Merge branch 'jk/maint-reflog-bottom' into maint
blob
|
diff
|
raw
2010-12-14
Merge branch 'mz/maint-rebase-stat-config' into maint
blob
|
diff
|
raw
2010-12-09
Merge branch 'np/diff-in-corrupt-repository' into maint
blob
|
diff
|
raw
2010-12-09
Merge branch 'cm/diff-check-at-eol' into maint
blob
|
diff
|
raw
2010-12-02
Prepare for 1.7.3.3
blob
|
diff
|
raw
2010-12-02
Merge branch 'cb/maint-orphan-merge-noclobber' into...
blob
|
diff
|
raw
2010-12-02
Merge branch 'ks/no-textconv-symlink' into maint
blob
|
diff
|
raw
2010-12-02
Merge branch 'maint-1.7.2' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'cb/diff-fname-optim' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'jk/no-textconv-symlink' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'aw/git-p4-deletion' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'kf/post-receive-sample-hook' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'mg/reset-doc' into maint
blob
|
diff
|
raw
2010-11-24
Merge branch 'tr/send-email-refuse-sending-unedited...
blob
|
diff
|
raw
2010-09-18
Merge branch 'js/ls-files-x-doc'
blob
|
diff
|
raw
2010-09-15
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
blob
|
diff
|
raw
2010-09-15
Merge branch 'os/fix-rebase-diff-no-prefix'
blob
|
diff
|
raw
2010-09-15
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
blob
|
diff
|
raw
2010-09-15
Merge branch 'ch/maint-cannot-create-bundle-error'
blob
|
diff
|
raw
2010-09-15
Merge branch 'ks/recursive-rename-add-identical'
blob
|
diff
|
raw
2010-09-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2010-09-12
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-10
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-10
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-08
Merge branch 'tf/cleanup-builtin-help-headers'
blob
|
diff
|
raw
2010-09-08
Merge branch 'jk/test-must-fail-missing'
blob
|
diff
|
raw
2010-09-08
Merge branch 'jh/error-removing-missing-note'
blob
|
diff
|
raw
2010-09-08
Merge branch 'kf/askpass-config'
blob
|
diff
|
raw
2010-09-08
Merge branch 'bc/maint-fetch-url-only'
blob
|
diff
|
raw
2010-09-08
Merge branch 'jk/maint-pass-c-config-in-env'
blob
|
diff
|
raw
2010-09-08
Merge branch 'en/d-f-conflict-fix'
blob
|
diff
|
raw
2010-09-07
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-06
Merge branch 'jh/clean-exclude'
blob
|
diff
|
raw
2010-09-06
Merge branch 'jl/maint-fix-test'
blob
|
diff
|
raw
2010-09-06
Merge branch 'maint'
v1.7.3-rc0
blob
|
diff
|
raw
2010-09-04
Merge branch 'jl/submodule-ignore-diff'
blob
|
diff
|
raw
2010-09-04
Merge branch 'ab/test-2'
blob
|
diff
|
raw
2010-09-04
Merge branch 'js/detached-stash'
blob
|
diff
|
raw
2010-09-04
Merge branch 'js/maint-reflog-beyond-horizon'
blob
|
diff
|
raw
2010-09-04
Merge branch 'dg/local-mod-error-messages'
blob
|
diff
|
raw
2010-09-04
Merge branch 'nd/maint-fix-replace'
blob
|
diff
|
raw
2010-09-03
Merge branch 'ab/compat-regex'
blob
|
diff
|
raw
2010-09-03
Merge branch 'nd/clone-depth-zero'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/maint-doc-user-manual-html-doctype'
blob
|
diff
|
raw
2010-09-03
Merge branch 'cb/maint-mergetool-no-tty'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/apply-filename-with-sp'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/merge-custom-no-trivial'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jc/maint-doc-em-dash'
blob
|
diff
|
raw
2010-08-24
Work around em-dash handling in newer AsciiDoc
blob
|
diff
|
raw
2010-08-19
Merge branch 'tr/xsize-bits' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'tr/xsize-bits'
blob
|
diff
|
raw
|
diff to current
2010-08-02
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'jn/gitweb-our-squelch'
blob
|
diff
|
raw
|
diff to current
2010-04-19
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2010-04-11
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
blob
|
diff
|
raw
|
diff to current
2010-04-10
Merge branch 'rc/maint-reflog-msg-for-forced-branch'
blob
|
diff
|
raw
|
diff to current
2010-03-24
Merge branch 'jc/color-attrs' into maint
blob
|
diff
|
raw
|
diff to current
2010-03-20
Merge branch 'jc/color-attrs'
blob
|
diff
|
raw
|
diff to current
2010-03-08
Merge branch 'fn/maint-mkdtemp-compat' into maint
blob
|
diff
|
raw
|
diff to current
2010-03-08
Merge branch 'jk/maint-push-tracking-wo-remote' into...
blob
|
diff
|
raw
|
diff to current
2010-03-07
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
blob
|
diff
|
raw
|
diff to current
2010-03-07
Merge branch 'tr/maint-cherry-pick-list' into maint...
blob
|
diff
|
raw
|
diff to current
2010-03-07
Merge branch 'fn/maint-mkdtemp-compat'
blob
|
diff
|
raw
|
diff to current
2010-03-07
Merge branch 'jk/maint-push-tracking-wo-remote'
blob
|
diff
|
raw
|
diff to current
2010-03-05
Merge branch 'tr/maint-cherry-pick-list' into maint
blob
|
diff
|
raw
|
diff to current
2010-03-05
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
blob
|
diff
|
raw
|
diff to current
2010-03-02
Merge branch 'tr/maint-cherry-pick-list'
blob
|
diff
|
raw
|
diff to current
2010-03-02
Merge branch 'gf/maint-sh-setup-nongit-ok'
blob
|
diff
|
raw
|
diff to current
2010-02-10
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
diff
|
raw
|
diff to current
2010-02-08
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
diff
|
raw
|
diff to current
2010-02-08
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
diff
|
raw
|
diff to current
2010-02-07
Merge git://repo.or.cz/git-gui
v1.7.0-rc2
blob
|
diff
|
raw
|
diff to current
2010-02-06
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2010-01-31
Merge commit 'b319ef7' into jc/maint-fix-test-perm
blob
|
diff
|
raw
|
diff to current
2010-01-29
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2010-01-24
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
|
diff to current
2010-01-10
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-31
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-30
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'jc/maint-am-keep' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'np/maint-sideband-favor-status' into...
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'jc/maint-am-keep'
blob
|
diff
|
raw
|
diff to current
2009-11-18
Merge branch 'np/maint-sideband-favor-status'
blob
|
diff
|
raw
|
diff to current
2009-10-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2009-09-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-09-16
Merge branch 'tf/diff-whitespace-incomplete-line' into...
blob
|
diff
|
raw
|
diff to current
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
blob
|
diff
|
raw
|
diff to current
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
|
diff to current
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
|
diff to current
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
|
diff to current
2009-09-03
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2009-09-03
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2009-09-01
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
diff
|
raw
|
diff to current
2009-08-28
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2009-08-21
Merge branch 'jc/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
|
diff to current
next