Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ct/advise-push-default' into maint
[gitweb.git]
/
builtin
/
merge.c
2012-05-11
Merge branch 'ct/advise-push-default' into maint
blob
|
diff
|
raw
2012-05-11
Merge branch 'js/fast-import-test-9300' into maint
blob
|
diff
|
raw
2012-05-11
Merge branch 'jk/repack-no-explode-objects-from-old...
blob
|
diff
|
raw
2012-05-11
Merge branch 'ah/maint-grep-double-init' into maint
blob
|
diff
|
raw
2012-05-11
Merge branch 'fa/maint-config-doc' into maint
blob
|
diff
|
raw
2012-05-11
Merge branch 'rs/unpack-trees-leakfix' into maint
blob
|
diff
|
raw
2012-05-11
Merge branch 'sl/test-wc-l-line-count' into maint
blob
|
diff
|
raw
2012-05-11
Merge branch 'rl/show-empty-prefix' into maint
blob
|
diff
|
raw
2012-05-10
Merge branch 'mm/include-userpath' into maint
blob
|
diff
|
raw
2012-05-10
Merge branch 'cc/fix-missing-va-end-in-revert' into...
blob
|
diff
|
raw
2012-05-10
Merge branch 'bw/test-fix-grep-gnuism' into maint
blob
|
diff
|
raw
2012-05-10
Merge branch 'jk/http-backend-keep-committer-ident...
blob
|
diff
|
raw
2012-05-10
Merge branch 'nl/rebase-i-cheat-sheet' into maint
blob
|
diff
|
raw
2012-05-10
Merge branch 'bw/submodule-sed-solaris' into maint
blob
|
diff
|
raw
2012-05-10
Merge branch 'jk/maint-push-progress' into maint
blob
|
diff
|
raw
2012-05-10
Merge branch 'jc/rerere-train' into maint
blob
|
diff
|
raw
2012-05-10
Merge branch 'lp/diffstat-with-graph' into maint
blob
|
diff
|
raw
2012-05-07
Merge branch 'jk/maint-gitweb-test-use-sane-perl' into...
blob
|
diff
|
raw
2012-05-07
Merge branch 'js/daemon-test-race-fix' into maint
blob
|
diff
|
raw
2012-05-07
Merge branch 'jk/maint-config-bogus-section' into maint
blob
|
diff
|
raw
2012-05-07
Merge branch 'pw/t5800-import-race-fix' into maint
blob
|
diff
|
raw
2012-05-07
Merge branch 'rt/cherry-revert-conflict-summary' into...
blob
|
diff
|
raw
2012-05-07
Merge branch 'cb/maint-report-mount-point-correctly...
blob
|
diff
|
raw
2012-05-03
Merge branch 'jc/merge-reduce-parents-early' into maint
blob
|
diff
|
raw
2012-05-03
Merge branch 'mb/fetch-call-a-non-branch-a-ref' into...
blob
|
diff
|
raw
|
diff to current
2012-05-03
Merge branch 'rl/maint-stash-i18n-save-error' into...
blob
|
diff
|
raw
|
diff to current
2012-05-03
Merge branch 'jm/maint-strncpy-diff-no-index' into...
blob
|
diff
|
raw
|
diff to current
2012-05-02
Merge branch 'pw/fast-import-dataref-parsing' into...
blob
|
diff
|
raw
|
diff to current
2012-05-02
Merge branch 'it/fetch-pack-many-refs' into maint
blob
|
diff
|
raw
|
diff to current
2012-05-02
Merge branch 'jl/maint-submodule-recurse-fetch' into...
blob
|
diff
|
raw
|
diff to current
2012-05-02
Merge branch 'jc/maint-blame-minimal' into maint
blob
|
diff
|
raw
|
diff to current
2012-05-02
Merge branch 'lp/maint-diff-three-dash-with-graph'...
blob
|
diff
|
raw
|
diff to current
2012-05-02
Merge branch 'jk/rebase-i-submodule-conflict-only'...
blob
|
diff
|
raw
|
diff to current
2012-04-27
Merge branch 'zj/mksh-columns-breakage' into lp/diffsta...
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'jk/run-command-eacces' into maint
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'jc/push-upstream-sanity' into maint
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'jc/maint-clean-nested-worktree-in-subdir...
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'jk/diff-no-rename-empty' into maint
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'rs/combine-diff-zero-context-at-the-begin...
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'jc/commit-unedited-template' into maint
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'jk/add-p-skip-conflicts' into maint
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'jc/commit-hook-authorship' into maint
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'tr/maint-word-diff-regex-sticky' into...
blob
|
diff
|
raw
|
diff to current
2012-04-26
Merge branch 'jh/notes-merge-in-git-dir-worktree' into...
blob
|
diff
|
raw
|
diff to current
2012-04-26
Sync with 1.7.9.7
blob
|
diff
|
raw
|
diff to current
2012-04-26
Sync with 1.7.8.6
blob
|
diff
|
raw
|
diff to current
2012-04-26
Sync with 1.7.7.7
blob
|
diff
|
raw
|
diff to current
2012-04-18
builtin/merge.c: reduce parents early
blob
|
diff
|
raw
|
diff to current
2012-04-18
builtin/merge.c: collect other parents early
blob
|
diff
|
raw
|
diff to current
2012-04-18
builtin/merge.c: remove "remoteheads" global variable
blob
|
diff
|
raw
|
diff to current
2012-04-10
Merge branch 'maint-1.7.9' into maint
blob
|
diff
|
raw
|
diff to current
2012-04-10
Merge branch 'maint-1.7.8' into maint-1.7.9
blob
|
diff
|
raw
|
diff to current
2012-04-09
Merge branch 'tr/cache-tree' into maint-1.7.8
blob
|
diff
|
raw
|
diff to current
2012-04-09
Merge branch 'cb/maint-t5541-make-server-port-portable...
blob
|
diff
|
raw
|
diff to current
2012-04-02
Merge branch 'pt/gitk'
blob
|
diff
|
raw
|
diff to current
2012-04-02
Sync with 1.7.9.6
blob
|
diff
|
raw
|
diff to current
2012-04-02
Merge branch 'jc/maint-merge-autoedit' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-31
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2012-03-26
Sync with 1.7.9.5
blob
|
diff
|
raw
|
diff to current
2012-03-26
Merge branch 'jn/maint-fast-import-empty-ls' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-26
Merge branch 'ph/rerere-doc' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-26
Merge branch 'ms/maint-config-error-at-eol-linecount...
blob
|
diff
|
raw
|
diff to current
2012-03-24
Merge gitk changes from Paul Mackerras at git://ozlabs...
blob
|
diff
|
raw
|
diff to current
2012-03-23
Merge branch 'am/completion-zsh-fix'
blob
|
diff
|
raw
|
diff to current
2012-03-23
Merge branch 'dw/gitweb-doc-grammo'
blob
|
diff
|
raw
|
diff to current
2012-03-20
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2012-03-20
Merge branch 'maint-1.7.8' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-20
merge: backport GIT_MERGE_AUTOEDIT support
blob
|
diff
|
raw
|
diff to current
2012-03-20
Merge branch 'ks/sort-wildcard-in-makefile' into maint...
blob
|
diff
|
raw
|
diff to current
2012-03-20
Merge branch 'jc/advise-i18n' into maint-1.7.8
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'ab/perl-i18n'
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'th/mergetools-deltawalker'
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'jc/maint-verify-objects-remove-pessimism'
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge "two fixes for fast-import's 'ls' command" from...
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'th/git-diffall'
blob
|
diff
|
raw
|
diff to current
2012-03-16
Merge branch 'th/doc-diff-submodule-option'
blob
|
diff
|
raw
|
diff to current
2012-03-13
Merge branch 'jc/maint-undefined-i18n-observation-test'
blob
|
diff
|
raw
|
diff to current
2012-03-13
Merge branch 'ms/maint-config-error-at-eol-linecount'
blob
|
diff
|
raw
|
diff to current
2012-03-13
Merge branch 'ph/rerere-doc'
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'az/verify-tag-use-gpg-config'
blob
|
diff
|
raw
|
diff to current
2012-03-12
Sync with 1.7.9.4
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'tr/maint-bundle-boundary' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'jc/maint-diff-patch-header' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'jn/maint-do-not-match-with-unsanitized...
blob
|
diff
|
raw
|
diff to current
2012-03-12
Merge branch 'jc/am-3-nonstandard-popt' into maint
blob
|
diff
|
raw
|
diff to current
2012-03-08
Merge branch 'kb/maint-prune-rmdir-closedir'
blob
|
diff
|
raw
|
diff to current
2012-03-08
Merge branch 'jl/maint-submodule-relative'
blob
|
diff
|
raw
|
diff to current
2012-03-08
Merge branch 'jn/maint-do-not-match-with-unsanitized...
blob
|
diff
|
raw
|
diff to current
2012-03-08
Merge branch 'vr/branch-doc'
blob
|
diff
|
raw
|
diff to current
2012-03-08
Merge v1.7.10-rc0 for git l10n update
blob
|
diff
|
raw
|
diff to current
2012-03-07
Merge branch 'jc/pickaxe-ignore-case'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'jh/threadable-symlink-check'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'jc/maint-diff-patch-header'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'th/mergetools-deltawalker'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'cn/pull-rebase-message'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'sl/modern-t0000'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'nl/http-proxy-auth'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'tr/maint-bundle-boundary'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'zj/diff-stat-dyncol'
blob
|
diff
|
raw
|
diff to current
2012-03-06
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
next