Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/maint-rev-list-nul' into maint
[gitweb.git]
/
builtin
/
merge.c
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-06
Merge branch 'xx/trivial' into maint
blob
|
diff
|
raw
|
diff to current
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
|
diff to current
2010-09-03
Merge branch 'ab/compat-regex'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'nd/clone-depth-zero'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'jn/maint-doc-user-manual-html-doctype'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'cb/maint-mergetool-no-tty'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'jn/apply-filename-with-sp'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'jn/merge-custom-no-trivial'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'jc/maint-doc-em-dash'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'mg/doc-bundle'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'jn/doc-backslash'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'jn/update-contrib-example-merge'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Merge branch 'jn/merge-renormalize'
blob
|
diff
|
raw
|
diff to current
2010-09-03
Sync with 1.7.2.3
blob
|
diff
|
raw
|
diff to current
2010-09-03
Move "show_all_errors = 1" to setup_unpack_trees_porcel...
blob
|
diff
|
raw
|
diff to current
2010-09-03
setup_unpack_trees_porcelain: take the whole options...
blob
|
diff
|
raw
|
diff to current
2010-09-03
Move set_porcelain_error_msgs to unpack-trees.c and...
blob
|
diff
|
raw
|
diff to current
2010-09-01
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-09-01
Merge branch 'sg/rerere-gc-old-still-used' into maint
blob
|
diff
|
raw
|
diff to current
2010-09-01
Merge branch 'en/rebase-against-rebase-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'np/maint-huge-delta-generation'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'da/fix-submodule-sync-superproject-config'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/cherry-revert-message-clean-up'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'cb/binary-patch-id'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'dj/fetch-tagopt'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'en/d-f-conflict-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/svn-fe'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'tr/maint-no-unquote-plus'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/paginate-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/maint-setup-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'en/fast-export-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'hv/autosquash-config'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'sg/rerere-gc-old-still-used'
blob
|
diff
|
raw
|
diff to current
2010-08-30
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-30
Merge branch 'maint-1.7.1' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-24
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-23
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'mm/rebase-i-exec'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'gb/split-cmdline-errmsg'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'so/http-user-agent'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'mm/shortopt-detached'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'sr/local-config'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'nd/fix-sparse-checkout'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'hv/submodule-find-ff-merge'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'en/rebase-against-rebase-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'dg/local-mod-error-messages'
blob
|
diff
|
raw
|
diff to current
2010-08-19
Merge branch 'tr/xsize-bits' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-19
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
diff
|
raw
|
diff to current
2010-08-18
merge: do not mistake (ancestor of) tag for branch
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'cc/find-commit-subject'
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'tr/xsize-bits'
blob
|
diff
|
raw
|
diff to current
2010-08-16
merge: let custom strategies intervene in trivial merges
blob
|
diff
|
raw
|
diff to current
2010-08-13
Merge branch 'jc/sha1-name-find-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-13
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
diff
|
raw
|
diff to current
2010-08-11
unpack_trees: group error messages by type
blob
|
diff
|
raw
|
diff to current
2010-08-11
merge-recursive: porcelain messages for checkout
blob
|
diff
|
raw
|
diff to current
2010-08-11
Turn unpack_trees_options.msgs into an array + enum
blob
|
diff
|
raw
|
diff to current
2010-08-11
split_cmdline: Allow caller to access error string
blob
|
diff
|
raw
|
diff to current
2010-08-06
merge-recursive --renormalize
blob
|
diff
|
raw
|
diff to current
2010-08-03
Merge branch 'sv/maint-diff-q-clear-fix' into maint
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-07-27
Sync with 1.7.1.2
blob
|
diff
|
raw
|
diff to current
2010-07-27
Sync with 1.7.0 series
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.7.1' into maint
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
diff
|
raw
|
diff to current
next