Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bg/merge-ff-only'
[gitweb.git]
/
Documentation
/
merge-options.txt
2009-11-10
Merge branch 'bg/merge-ff-only'
blob
|
diff
|
raw
2009-11-10
Merge branch 'vl/maint-openssl-signature-change'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'jk/maint-push-config'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'jk/gitignore-anchored'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'jp/dirty-describe'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'sr/blame-incomplete'
blob
|
diff
|
raw
|
diff to current
2009-11-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-11-07
Merge branch 'jc/commit-s-subject-is-not-a-footer'
blob
|
diff
|
raw
|
diff to current
2009-11-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-11-02
Merge branch 'jn/show-normalized-refs'
blob
|
diff
|
raw
|
diff to current
2009-11-02
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-10-31
fixup tr/stash-format merge
blob
|
diff
|
raw
|
diff to current
2009-10-31
Merge branch 'js/diff-verbose-submodule'
blob
|
diff
|
raw
|
diff to current
2009-10-31
Merge branch 'jc/checkout-auto-track'
blob
|
diff
|
raw
|
diff to current
2009-10-31
Merge branch 'jn/show-normalized-refs'
blob
|
diff
|
raw
|
diff to current
2009-10-31
Merge branch 'jc/maint-1.6.3-graft-trailing-space'
blob
|
diff
|
raw
|
diff to current
2009-10-31
Merge branch 'ak/bisect-reset-to-switch'
blob
|
diff
|
raw
|
diff to current
2009-10-31
Merge branch 'tr/maint-roff-quote'
blob
|
diff
|
raw
|
diff to current
2009-10-31
Merge branch 'ja/fetch-doc'
blob
|
diff
|
raw
|
diff to current
2009-10-30
Teach 'git merge' and 'git pull' the option --ff-only
blob
|
diff
|
raw
|
diff to current
2009-10-27
Merge git://repo.or.cz/git-gui
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 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
diff
|
raw
|
diff to current
2009-10-22
Documentation/merge-options.txt: order options in alpha...
blob
|
diff
|
raw
|
diff to current
2009-10-19
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
blob
|
diff
|
raw
|
diff to current
2009-10-19
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
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-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-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-26
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
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-19
Merge branch 'tr/maint-1.6.3-add-p-modeonly-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-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 'cc/bisect'
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 'rc/maint-http-local-slot-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 'ph/submodule-rebase'
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'jc/cache-tree'
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-13
Merge branch 'rc/http-push'
blob
|
diff
|
raw
|
diff to current
2009-06-13
Merge branch 'cc/bisect' (early part)
blob
|
diff
|
raw
|
diff to current
2009-06-13
Merge branch 'rc/maint-http-local-slot-fix'
blob
|
diff
|
raw
|
diff to current
2009-06-13
Merge branch 'ph/submodule-rebase' (early part)
blob
|
diff
|
raw
|
diff to current
2009-06-13
Merge branch 'da/araxis-mergetool'
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
2009-06-02
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-02
Merge branch 'rs/maint-grep-word-regexp-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-02
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
blob
|
diff
|
raw
|
diff to current
2009-06-02
Merge branch 'jc/maint-add-p-coalesce-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-31
Merge branch 'sb/opt-filename'
blob
|
diff
|
raw
|
diff to current
2009-05-31
Merge branch 'jc/solaris-0811'
blob
|
diff
|
raw
|
diff to current
2009-05-31
Merge branch 'sb/show-branch-parse-options'
blob
|
diff
|
raw
|
diff to current
2009-05-31
Merge branch 'mm/apply-double-slash'
blob
|
diff
|
raw
|
diff to current
2009-05-31
Merge branch 'sb/format-patch-parseopt'
blob
|
diff
|
raw
|
diff to current
2009-05-31
Merge branch 'jc/mktree'
blob
|
diff
|
raw
|
diff to current
2009-05-31
Merge branch 'mw/send-email'
blob
|
diff
|
raw
|
diff to current
2009-05-31
Merge branch 'cc/bisect' (early part)
blob
|
diff
|
raw
|
diff to current
2009-05-31
t9139 uses ancient, backwards-compatible iconv names
blob
|
diff
|
raw
|
diff to current
2009-05-29
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
blob
|
diff
|
raw
|
diff to current
2009-05-29
Merge branch 'jc/maint-add-p-coalesce-fix'
blob
|
diff
|
raw
|
diff to current
2009-05-29
Merge branch 'rs/maint-grep-word-regexp-fix'
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'js/maint-no-ln-across-libexec-and-bin...
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'lt/maint-diff-reduce-lstat' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'jm/format-patch-no-auto-n-when-k-is-given...
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'do/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'jk/maint-1.6.0-trace-argv' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'np/push-delta' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'ar/merge-one-file-diag' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'ar/unlink-err' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'jk/maint-add-empty' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-25
merge-options.txt: Clarify merge --squash
blob
|
diff
|
raw
|
diff to current
2009-05-24
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-05-23
Merge branch 'jk/maint-1.6.0-trace-argv'
blob
|
diff
|
raw
|
diff to current
2009-05-14
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-05-09
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-05-06
Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
blob
|
diff
|
raw
|
diff to current
next