Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅ next
commit
grep
author
committer
pickaxe
?
re
log: add log.mailmap configuration option
[gitweb.git]
/
merge.c
2012-12-10
Sync with 1.8.0.2
blob
|
diff
|
raw
2012-12-07
Merge branch 'maint'
blob
|
diff
|
raw
2012-12-04
Merge branch 'mm/status-push-pull-advise'
blob
|
diff
|
raw
2012-12-03
Merge branch 'mm/status-push-pull-advise'
blob
|
diff
|
raw
2012-11-29
Merge branch 'lt/diff-stat-show-0-lines'
blob
|
diff
|
raw
2012-11-29
Merge branch 'fc/remote-hg'
blob
|
diff
|
raw
2012-11-29
Merge branch 'mk/complete-tcsh'
blob
|
diff
|
raw
2012-11-29
Merge branch 'jc/doc-push-satellite'
blob
|
diff
|
raw
2012-11-29
Merge branch 'jl/submodule-rm'
blob
|
diff
|
raw
2012-11-29
Merge branch 'pp/gitweb-config-underscore'
blob
|
diff
|
raw
2012-11-29
Merge branch 'fc/completion-test-simplification'
blob
|
diff
|
raw
2012-11-29
Merge branch 'maint'
blob
|
diff
|
raw
2012-11-28
Merge branch 'maint'
blob
|
diff
|
raw
2012-11-28
Merge branch 'mm/status-push-pull-advise'
blob
|
diff
|
raw
2012-11-28
Merge branch 'jk/pickaxe-textconv'
blob
|
diff
|
raw
2012-11-27
Merge branch 'maint'
blob
|
diff
|
raw
2012-11-26
Merge branch 'maint'
blob
|
diff
|
raw
2012-11-26
Merge branch 'rr/submodule-diff-config'
blob
|
diff
|
raw
2012-11-26
Merge branch 'nd/maint-compat-fnmatch-fix'
blob
|
diff
|
raw
2012-11-26
Merge branch 'bc/do-not-recurse-in-die'
blob
|
diff
|
raw
2012-11-26
Merge branch 'mk/complete-tcsh'
blob
|
diff
|
raw
2012-11-26
Merge branch 'jh/update-ref-d-through-symref'
blob
|
diff
|
raw
2012-11-26
Merge branch 'lt/diff-stat-show-0-lines'
blob
|
diff
|
raw
2012-11-26
Merge branch 'sg/complete-help-undup'
blob
|
diff
|
raw
2012-11-26
Sync with 1.8.0.1
blob
|
diff
|
raw
2012-11-21
Merge branch 'esr/maint-doc-fast-import'
blob
|
diff
|
raw
2012-11-21
Merge branch 'wtk/submodule-doc-fixup'
blob
|
diff
|
raw
2012-11-21
Merge branch 'so/prompt-command'
blob
|
diff
|
raw
2012-11-21
Merge branch 'jk/config-ignore-duplicates'
blob
|
diff
|
raw
2012-11-21
Merge branch 'jk/maint-http-half-auth-fetch'
blob
|
diff
|
raw
2012-11-20
Merge branch 'jk/checkout-out-of-unborn'
blob
|
diff
|
raw
2012-11-20
Merge branch 'cn/config-missing-path'
blob
|
diff
|
raw
2012-11-20
Merge branch 'jl/submodule-rm'
blob
|
diff
|
raw
2012-11-20
Merge branch 'jk/maint-gitweb-xss'
blob
|
diff
|
raw
2012-11-20
Merge branch 'rh/maint-gitweb-highlight-ext'
blob
|
diff
|
raw
2012-11-20
Merge branch 'pw/maint-p4-rcs-expansion-newline'
blob
|
diff
|
raw
2012-11-20
Merge branch 'mh/alt-odb-string-list-cleanup'
blob
|
diff
|
raw
2012-11-20
Merge branch 'ta/doc-cleanup'
blob
|
diff
|
raw
2012-11-20
Merge branch 'kb/preload-index-more'
blob
|
diff
|
raw
2012-11-20
Merge branch 'jk/maint-http-half-auth-fetch'
blob
|
diff
|
raw
2012-11-20
Sync with maint
blob
|
diff
|
raw
2012-11-19
Sync with maint
blob
|
diff
|
raw
2012-11-15
Merge branch 'jc/prettier-pretty-note'
blob
|
diff
|
raw
2012-11-15
Merge branch 'mg/maint-pull-suggest-upstream-to'
blob
|
diff
|
raw
2012-11-15
Merge branch 'mh/notes-string-list'
blob
|
diff
|
raw
2012-11-15
Merge branch 'mh/strbuf-split'
blob
|
diff
|
raw
2012-11-15
Merge branch 'mm/maint-doc-commit-edit'
blob
|
diff
|
raw
2012-11-15
Merge branch 'as/maint-doc-fix-no-post-rewrite'
blob
|
diff
|
raw
2012-11-15
Merge branch 'js/hp-nonstop'
blob
|
diff
|
raw
2012-11-15
Merge branch 'cr/cvsimport-local-zone'
blob
|
diff
|
raw
2012-11-15
Merge branch 'jc/same-encoding'
blob
|
diff
|
raw
2012-11-15
Merge branch 'ph/submodule-sync-recursive'
blob
|
diff
|
raw
2012-11-15
Merge branch 'jk/maint-diff-grep-textconv'
blob
|
diff
|
raw
2012-11-15
Merge branch 'jh/symbolic-ref-d'
blob
|
diff
|
raw
2012-11-15
Merge branch 'jc/maint-fetch-tighten-refname-check'
blob
|
diff
|
raw
2012-11-09
Merge branch 'ph/maint-submodule-status-fix'
blob
|
diff
|
raw
2012-11-09
Merge branch 'nd/builtin-to-libgit'
blob
|
diff
|
raw
2012-10-29
Move try_merge_command and checkout_fast_forward to...
blob
|
diff
|
raw