Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bs/maint-pre-commit-hook-sample' into maint
[gitweb.git]
/
Documentation
/
git-merge.txt
2009-11-16
Merge branch 'bs/maint-pre-commit-hook-sample' into...
blob
|
diff
|
raw
2009-11-16
Merge branch 'jk/maint-add-p-empty' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'js/maint-diff-color-words' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'tz/maint-rpm' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'jk/maint-format-patch-p-suppress-stat...
blob
|
diff
|
raw
2009-11-16
Merge branch 'pb/maint-gitweb-blob-lineno' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'vl/maint-openssl-signature-change' into...
blob
|
diff
|
raw
2009-11-16
Merge branch 'jk/maint-push-config' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'sr/blame-incomplete' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'jc/maint-blank-at-eof' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
blob
|
diff
|
raw
2009-11-16
Merge branch 'tr/maint-roff-quote' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'ja/fetch-doc' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'cb/doc-fetch-pull-merge' into maint
blob
|
diff
|
raw
2009-11-16
Merge branch 'jn/gitweb-patch' into maint
blob
|
diff
|
raw
|
diff to current
2009-10-28
Merge branch 'maint-1.6.4' into maint
blob
|
diff
|
raw
|
diff to current
2009-10-25
Merge branch 'maint-1.6.4' into maint
blob
|
diff
|
raw
|
diff to current
2009-10-25
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
blob
|
diff
|
raw
|
diff to current
2009-10-25
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
diff
|
raw
|
diff to current
2009-10-24
Merge branch 'jp/maint-send-email-fold' into maint
blob
|
diff
|
raw
|
diff to current
2009-10-24
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
diff
|
raw
|
diff to current
2009-10-24
Merge branch 'pv/maint-add-p-no-exclude' into maint
blob
|
diff
|
raw
|
diff to current
2009-10-21
modernize fetch/merge/pull examples
blob
|
diff
|
raw
2009-10-17
Merge branch 'maint-1.6.4' into maint
blob
|
diff
|
raw
|
diff to current
2009-10-13
Merge branch 'maint-1.6.4' into maint
blob
|
diff
|
raw
|
diff to current
2009-10-09
Merge branch 'rs/maint-archive-prefix'
blob
|
diff
|
raw
|
diff to current
2009-10-09
Merge branch 'fc/mutt-alias'
blob
|
diff
|
raw
|
diff to current
2009-10-09
Merge branch 'ef/msvc-noreturn'
blob
|
diff
|
raw
|
diff to current
2009-10-09
Merge branch 'jk/reflog-date'
blob
|
diff
|
raw
|
diff to current
2009-10-09
Merge branch 'ch/am-header'
blob
|
diff
|
raw
|
diff to current
2009-10-09
Documentation: clarify mergeoptions description
blob
|
diff
|
raw
|
diff to current
2009-10-09
Documentation: git fmt-merge-msg does not have to be...
blob
|
diff
|
raw
|
diff to current
2009-10-04
Merge branch 'jc/maint-1.6.4-show-branch-default' into...
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-16
Merge branch 'jc/maint-checkout-index-to-prefix' 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-13
Merge branch 'db/vcs-helper'
blob
|
diff
|
raw
|
diff to current
2009-09-13
Merge branch 'cb/maint-1.6.3-grep-relative-up' into...
blob
|
diff
|
raw
|
diff to current
2009-09-07
Merge branch 'tr/reset-checkout-patch'
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 'mr/gitweb-snapshot'
blob
|
diff
|
raw
|
diff to current
2009-09-01
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
diff
|
raw
|
diff to current
2009-08-29
Merge branch 'jc/shortstatus'
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-28
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-08-28
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
diff
|
raw
|
diff to current
2009-08-28
Merge branch 'lt/block-sha1'
blob
|
diff
|
raw
|
diff to current
2009-08-27
Merge branch 'nd/sparse' (early part)
blob
|
diff
|
raw
|
diff to current
2009-08-26
Merge branch 'js/maint-cover-letter-non-ascii' into...
blob
|
diff
|
raw
|
diff to current
2009-08-26
Merge branch 'jc/maint-clean-nested-dir-safety' into...
blob
|
diff
|
raw
|
diff to current
2009-08-26
Merge branch 'jk/maint-merge-msg-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-26
Merge branch 'jc/apply-epoch-patch' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-26
Merge branch 'jp/symlink-dirs' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-26
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
blob
|
diff
|
raw
|
diff to current
2009-08-25
Merge branch 'aj/fix-read-tree-from-scratch'
blob
|
diff
|
raw
|
diff to current
2009-08-25
Merge branch 'jc/maint-checkout-index-to-prefix'
blob
|
diff
|
raw
|
diff to current
2009-08-24
Merge branch 'jc/verify-pack-stat'
blob
|
diff
|
raw
|
diff to current
2009-08-24
Merge branch 'mr/gitweb-xz'
blob
|
diff
|
raw
|
diff to current
2009-08-24
Merge branch 'ld/p4'
blob
|
diff
|
raw
|
diff to current
2009-08-22
Merge branch 'bc/maint-am-email' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-22
Merge branch 'cc/replace'
blob
|
diff
|
raw
|
diff to current
2009-08-22
Merge branch 'gb/apply-ignore-whitespace'
blob
|
diff
|
raw
|
diff to current
2009-08-22
Merge branch 'bc/mailsplit-cr-at-eol'
blob
|
diff
|
raw
|
diff to current
2009-08-21
Merge branch 'jc/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-21
Merge branch 'zf/maint-gitweb-acname' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-21
Merge branch 'np/maint-limit-delta-cache' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-21
Merge branch 'jk/maint-show-tag' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-21
Merge branch 'sb/maint-pull-rebase' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-19
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
blob
|
diff
|
raw
|
diff to current
2009-08-16
Merge branch 'lt/block-sha1'
blob
|
diff
|
raw
|
diff to current
2009-08-16
Merge branch 'bc/maint-am-email'
blob
|
diff
|
raw
|
diff to current
2009-08-16
Merge branch 'js/maint-cover-letter-non-ascii'
blob
|
diff
|
raw
|
diff to current
2009-08-16
Merge branch 'jc/maint-clean-nested-dir-safety'
blob
|
diff
|
raw
|
diff to current
2009-08-16
Merge branch 'jk/maint-merge-msg-fix'
blob
|
diff
|
raw
|
diff to current
2009-08-16
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-08-14
Merge branch 'jn/gitweb-blame' (early part)
blob
|
diff
|
raw
|
diff to current
2009-08-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-08-12
Merge branch 'maint-1.6.3' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-12
Documentation: merge: one <remote> is required
blob
|
diff
|
raw
|
diff to current
2009-08-11
Merge branch 'jc/maint-merge-recursive-fix'
blob
|
diff
|
raw
|
diff to current
2009-08-08
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2009-08-08
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-07-29
Merge branch 'hv/cvsps-tests'
blob
|
diff
|
raw
|
diff to current
2009-07-02
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
blob
|
diff
|
raw
|
diff to current
2009-06-22
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-22
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'pb/maint-1.6.2-userdiff-fix'
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'sb/maint-1.6.0-add-config-fix'
blob
|
diff
|
raw
|
diff to current
2009-06-20
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-06-14
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-14
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-06-11
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
diff
|
raw
|
diff to current
next