Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Add branch --set-upstream
[gitweb.git]
/
builtin-merge.c
2009-11-23
Merge branch 'th/remote-usage'
blob
|
diff
|
raw
2009-11-23
Merge branch 'pb/maint-use-custom-perl'
blob
|
diff
|
raw
2009-11-23
Merge branch 'mm/config-pathname-tilde-expand'
blob
|
diff
|
raw
2009-11-23
Merge branch 'bc/grep-i-F'
blob
|
diff
|
raw
2009-11-23
Merge branch 'jk/maint-break-rename-reduce-memory'
blob
|
diff
|
raw
2009-11-23
Merge branch 'tr/maint-merge-ours-clarification' (early...
blob
|
diff
|
raw
2009-11-21
Merge branch 'jc/fix-tree-walk' (early part)
blob
|
diff
|
raw
2009-11-21
Merge branch 'jh/notes' (early part)
blob
|
diff
|
raw
2009-11-21
Merge branch 'sp/smart-http'
blob
|
diff
|
raw
2009-11-21
Merge branch 'bw/autoconf-more'
blob
|
diff
|
raw
2009-11-21
Merge branch 'jn/editor-pager'
blob
|
diff
|
raw
2009-11-21
Merge branch 'rj/cygwin-msvc'
blob
|
diff
|
raw
2009-11-21
Merge branch 'rj/maint-simplify-cygwin-makefile'
blob
|
diff
|
raw
2009-11-21
Merge branch 'bg/format-patch-doc-update'
blob
|
diff
|
raw
2009-11-21
Merge branch 'tr/filter-branch'
blob
|
diff
|
raw
2009-11-21
Merge branch 'sc/protocol-doc'
blob
|
diff
|
raw
2009-11-21
Merge branch 'jl/submodule-add-noname'
blob
|
diff
|
raw
2009-11-21
Merge branch 'sb/ls-tree-parseopt'
blob
|
diff
|
raw
2009-11-21
Merge branch 'rg/doc-workflow'
blob
|
diff
|
raw
2009-11-21
Merge branch 'jn/gitweb-log-history'
blob
|
diff
|
raw
2009-11-21
Merge branch 'jn/help-everywhere'
blob
|
diff
|
raw
2009-11-21
Merge branch 'jp/fetch-cull-many-refs'
blob
|
diff
|
raw
2009-11-18
Merge branch 'np/maint-sideband-favor-status'
blob
|
diff
|
raw
2009-11-18
Merge branch 'sb/tutorial-test'
blob
|
diff
|
raw
2009-11-18
Merge branch 'ef/msys-imap'
blob
|
diff
|
raw
2009-11-17
Merge git://git.bogomips.org/git-svn
blob
|
diff
|
raw
2009-11-16
Sync with 1.6.5.3
blob
|
diff
|
raw
2009-11-16
Merge branch 'bs/maint-pre-commit-hook-sample' into...
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-add-p-empty' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'js/maint-diff-color-words' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'tz/maint-rpm' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-format-patch-p-suppress-stat...
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'pb/maint-gitweb-blob-lineno' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'vl/maint-openssl-signature-change' into...
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-push-config' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'sr/blame-incomplete' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jc/maint-blank-at-eof' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'maint'
blob
|
diff
|
raw
2009-11-16
Merge branch 'bs/maint-pre-commit-hook-sample'
blob
|
diff
|
raw
2009-11-16
Merge branch 'js/maint-diff-color-words'
blob
|
diff
|
raw
2009-11-16
Merge branch 'rs/pretty-wrap'
blob
|
diff
|
raw
2009-11-16
Merge branch 'js/log-rewrap'
blob
|
diff
|
raw
2009-11-16
Merge branch 'fc/doc-fast-forward'
blob
|
diff
|
raw
2009-11-16
Merge branch 'sc/difftool-p4merge'
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-add-p-empty'
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'lt/revision-bisect'
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jc/maint-1.6.3-graft-trailing-space'...
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'tr/maint-roff-quote' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'ja/fetch-doc' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'cb/doc-fetch-pull-merge' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-cvsimport-pathname' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jc/receive-pack-auto' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'gb/maint-gitweb-esc-param' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jn/gitweb-patch' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-15
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-11-11
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'jk/maint-format-patch-p-suppress-stat'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'pb/maint-gitweb-blob-lineno'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'tr/describe-advice'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'jk/maint-1.6.3-ls-files-i'
blob
|
diff
|
raw
|
diff to current
2009-11-10
Merge branch 'bg/merge-ff-only'
blob
|
diff
|
raw
|
diff to current
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-10
Merge branch 'jn/maint-http-fetch-mingw' into jn/help...
blob
|
diff
|
raw
|
diff to current
2009-11-10
merge: do not setup worktree twice
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 'jc/maint-1.6.3-graft-trailing-space'
blob
|
diff
|
raw
|
diff to current
2009-10-31
Merge branch 'tr/maint-roff-quote'
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-28
Merge branch 'maint-1.6.4' into maint
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 '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-25
Use 'fast-forward' all over the place
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-20
Refactor pretty_print_commit arguments into a struct
blob
|
diff
|
raw
|
diff to current
2009-10-19
Merge branch 'jp/maint-send-email-fold'
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-17
Merge branch 'jc/maint-blank-at-eof'
blob
|
diff
|
raw
|
diff to current
2009-10-17
Merge branch 'maint-1.6.4' into maint
blob
|
diff
|
raw
|
diff to current
2009-10-14
Merge branch 'pv/maint-add-p-no-exclude'
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 'maint'
blob
|
diff
|
raw
|
diff to current
2009-10-08
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-10-04
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
next