Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jn/makefile'
[gitweb.git]
/
builtin-merge.c
2010-01-17
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
blob
|
diff
|
raw
2010-01-17
Merge branch 'sr/gfi-options'
blob
|
diff
|
raw
2010-01-13
Merge branch 'jc/checkout-merge-base'
blob
|
diff
|
raw
2010-01-13
Merge branch 'il/vcs-helper'
blob
|
diff
|
raw
2010-01-13
Merge branch 'nd/sparse'
blob
|
diff
|
raw
2010-01-10
Merge branch 'tr/http-updates'
blob
|
diff
|
raw
2010-01-10
Merge branch 'jk/maint-1.6.5-reset-hard'
blob
|
diff
|
raw
2010-01-10
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
blob
|
diff
|
raw
2010-01-10
Merge branch 'bg/maint-remote-update-default'
blob
|
diff
|
raw
2010-01-10
Merge branch 'mm/diag-path-in-treeish'
blob
|
diff
|
raw
2010-01-10
Merge branch 'fc/opt-quiet-gc-reset'
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
diff
|
raw
|
diff to current
2010-01-10
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2010-01-07
Merge branch 'js/filter-branch-prime'
blob
|
diff
|
raw
2010-01-07
Merge branch 'sb/maint-octopus'
blob
|
diff
|
raw
2010-01-07
Merge branch 'bg/maint-add-all-doc'
blob
|
diff
|
raw
2010-01-07
Merge branch 'mv/commit-date'
blob
|
diff
|
raw
2010-01-07
Merge branch 'mo/bin-wrappers'
blob
|
diff
|
raw
2009-12-31
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-12-30
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
2009-12-30
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-12-28
Merge branch 'jk/1.7.0-status'
blob
|
diff
|
raw
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
diff
|
raw
2009-12-26
Merge branch 'gb/1.7.0-diff-whitespace-only-output'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-push-safety'
blob
|
diff
|
raw
2009-12-26
Merge branch 'jc/1.7.0-send-email-no-thread-default'
blob
|
diff
|
raw
2009-12-26
Merge branch 'sr/vcs-helper'
blob
|
diff
|
raw
2009-12-22
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-20
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-16
Merge branch 'maint' to sync with 1.6.5.7
blob
|
diff
|
raw
2009-12-11
Sync with 1.6.5.6
blob
|
diff
|
raw
2009-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2009-12-09
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-12-09
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-09
Merge branch 'mm/maint-merge-ff-error-message-fix'...
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge branch 'jn/maint-pull-rebase-error-message' into...
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge branch 'jk/maint-add-p-delete-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://git.bogomips.org/git-svn
blob
|
diff
|
raw
2009-12-08
Revert recent "git merge <msg> HEAD <commit>..." deprec...
blob
|
diff
|
raw
2009-12-07
Merge branch 'master' into il/vcs-helper
blob
|
diff
|
raw
|
diff to current
2009-12-05
Sync with 1.6.5.5
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'uk/maint-shortlog-encoding' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'fc/maint-format-patch-pathspec-dashes...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'ap/maint-merge-strategy-list-fix' into...
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 'rs/work-around-grep-opt-insanity' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-cygwin-count-objects' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mm/maint-hint-failed-merge' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'th/maint-remote-update-help-string' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-t9700' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'ls/maint-mailinfo-no-inbody' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mo/maint-crlf-doc' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'th/remote-usage' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'pb/maint-use-custom-perl' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mm/config-pathname-tilde-expand' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'bc/grep-i-F' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'jk/maint-break-rename-reduce-memory'...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-simplify-cygwin-makefile' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rg/doc-workflow' 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-12-03
Merge in 1.6.5.4
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-02
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-02
merge: do not add standard message when message is...
blob
|
diff
|
raw
|
diff to current
2009-12-02
Do not misidentify "git merge foo HEAD" as an old-style...
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'jc/deprecate-old-syntax-from-merge'
blob
|
diff
|
raw
|
diff to current
2009-12-01
git-merge: a deprecation notice of the ancient command...
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'bw/remote-get-ref-states-fix'
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'jn/gitweb-blame'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'fc/maint-format-patch-pathspec-dashes'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'mm/maint-merge-ff-error-message-fix'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'ap/maint-merge-strategy-list-fix'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'jc/pretty-lf'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'cc/bisect-doc'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'em/commit-claim'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'jc/mailinfo-remove-brackets'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'fc/send-email-envelope'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'uk/maint-shortlog-encoding'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'jc/maint-am-keep'
blob
|
diff
|
raw
|
diff to current
2009-11-30
builtin-merge: show user-friendly error messages for...
blob
|
diff
|
raw
|
diff to current
2009-11-30
builtin-merge.c: call exclude_cmds() correctly.
blob
|
diff
|
raw
|
diff to current
2009-11-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-11-25
Merge branch 'rs/work-around-grep-opt-insanity'
blob
|
diff
|
raw
|
diff to current
2009-11-24
Merge branch 'rj/maint-cygwin-count-objects'
blob
|
diff
|
raw
|
diff to current
2009-11-24
Merge branch 'mm/maint-hint-failed-merge'
blob
|
diff
|
raw
|
diff to current
2009-11-24
Merge branch 'jc/log-stdin'
blob
|
diff
|
raw
|
diff to current
2009-11-24
Merge branch 'mr/gitweb-snapshot'
blob
|
diff
|
raw
|
diff to current
2009-11-24
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'bg/fetch-multi'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'th/maint-remote-update-help-string'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'jn/faster-completion-startup'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'rj/maint-t9700'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'ls/maint-mailinfo-no-inbody'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'mo/maint-crlf-doc'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'th/remote-usage'
blob
|
diff
|
raw
|
diff to current
next