Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/advice-doc' into maint
[gitweb.git]
/
builtin
/
merge.c
2011-12-28
Merge branch 'jn/maint-sequencer-fixes' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'jk/maint-snprintf-va-copy' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'jk/maint-push-over-dav' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'jk/maint-mv' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'jk/fetch-no-tail-match-refs' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'ew/keepalive' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'ci/stripspace-docs' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'jh/fast-import-notes' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'aw/rebase-i-stop-on-failure-to-amend...
blob
|
diff
|
raw
2011-12-28
Merge branch 'tj/maint-imap-send-remove-unused' into...
blob
|
diff
|
raw
2011-12-28
Merge branch 'jn/branch-move-to-self' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'na/strtoimax' into maint
blob
|
diff
|
raw
2011-12-28
Merge branch 'jk/refresh-porcelain-output' into maint
blob
|
diff
|
raw
2011-12-21
Merge branch 'jl/submodule-status-failure-report' into...
blob
|
diff
|
raw
2011-12-21
Merge branch 'tr/userdiff-c-returns-pointer' into maint
blob
|
diff
|
raw
2011-12-21
Merge branch 'bc/maint-apply-check-no-patch' into maint
blob
|
diff
|
raw
2011-12-21
Merge branch 'cn/maint-lf-to-crlf-filter' into maint
blob
|
diff
|
raw
2011-12-21
Merge branch 'jk/maint-upload-archive' into maint
blob
|
diff
|
raw
2011-12-21
Merge branch 'ms/commit-cc-option-helpstring' into...
blob
|
diff
|
raw
2011-12-14
Merge branch 'jc/maint-pack-object-cycle' into maint
blob
|
diff
|
raw
2011-12-14
Merge branch 'jc/index-pack-reject-dups' into maint
blob
|
diff
|
raw
2011-12-14
Merge branch 'mf/curl-select-fdset' into maint
blob
|
diff
|
raw
2011-12-14
Merge branch 'nd/misc-cleanups' into maint
blob
|
diff
|
raw
2011-12-14
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
2011-12-14
Merge branch 'ab/clang-lints' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'maint-1.7.6' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jk/maint-fetch-status-table' into maint...
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'jc/maint-name-rev-all' into maint-1.7.6
blob
|
diff
|
raw
|
diff to current
2011-12-14
Merge branch 'ml/mailmap' into maint-1.7.6
blob
|
diff
|
raw
|
diff to current
2011-12-09
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'maint-1.7.6' into maint-1.7.7
blob
|
diff
|
raw
|
diff to current
2011-12-05
Merge branch 'js/merge-edit-option'
blob
|
diff
|
raw
|
diff to current
2011-11-28
checkout,merge: loosen overwriting untracked file check...
blob
|
diff
|
raw
|
diff to current
2011-11-23
Merge branch 'maint' into tj/imap-send-remove-unused
blob
|
diff
|
raw
|
diff to current
2011-11-21
Merge branch 'jk/maint-1.6.2-upload-archive' into jk...
blob
|
diff
|
raw
|
diff to current
2011-11-21
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2011-11-21
Merge branch 'rr/misc-fixes'
blob
|
diff
|
raw
|
diff to current
2011-11-18
Merge branch 'rr/misc-fixes'
blob
|
diff
|
raw
|
diff to current
2011-11-18
Sync with 1.7.7.4
blob
|
diff
|
raw
|
diff to current
2011-11-18
Merge branch 'jc/maint-name-rev-all' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-18
Merge branch 'ml/mailmap' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-18
Merge branch 'jn/maint-notes-avoid-va-args' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-17
do not let git_path clobber errno when reporting errors
blob
|
diff
|
raw
|
diff to current
2011-11-12
Merge branch 'ly/mktree-using-strbuf'
blob
|
diff
|
raw
|
diff to current
2011-11-10
Merge "Move 'builtin-*' into a 'builtin/' subdirectory"
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'jc/remote-setbranches-usage-fix'
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'fc/remote-seturl-usage-fix'
blob
|
diff
|
raw
|
diff to current
2011-11-09
Sync with 1.7.7.3
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'jc/maint-remove-renamed-ref' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'jm/maint-gitweb-filter-forks-fix' into...
blob
|
diff
|
raw
|
diff to current
2011-11-09
Merge branch 'dm/pack-objects-update' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-08
Merge branch 'ss/blame-textconv-fake-working-tree'
blob
|
diff
|
raw
|
diff to current
2011-11-07
Merge branch 'ab/i18n-test-fix'
blob
|
diff
|
raw
|
diff to current
2011-11-07
Merge branch 'sn/http-auth-with-netrc-fix'
blob
|
diff
|
raw
|
diff to current
2011-11-07
Merge branch 'pw/p4-appledouble-fix'
blob
|
diff
|
raw
|
diff to current
2011-11-01
Sync with 1.7.7.2
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'md/smtp-tls-hello-again' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'jk/pull-rebase-with-work-tree' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'jc/maint-diffstat-numstat-context' into...
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'js/bisect-no-checkout' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'bc/attr-ignore-case' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'cn/fetch-prune' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'sp/smart-http-failure' into maint
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge jn/maint-http-error-message
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'jk/name-hash-dirent'
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'ss/blame-textconv-fake-working-tree'
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'dm/pack-objects-update'
blob
|
diff
|
raw
|
diff to current
2011-11-01
Merge branch 'nd/pretty-commit-log-message'
blob
|
diff
|
raw
|
diff to current
2011-10-31
Merge branch 'jk/git-tricks'
blob
|
diff
|
raw
|
diff to current
2011-10-27
Merge branch 'rj/gitweb-clean-js'
blob
|
diff
|
raw
|
diff to current
2011-10-27
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'tc/submodule-clone-name-detection'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'lh/gitweb-site-html-head'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'mm/mediawiki-author-fix'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'jn/libperl-git-config'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'jm/maint-gitweb-filter-forks-fix'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'cn/fetch-prune'
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'jn/gitweb-highlite-sanitise' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'jk/argv-array' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'jc/run-receive-hook-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'cn/eradicate-working-copy' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'maint-1.7.6' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'ps/gitweb-js-with-lineno' into maint...
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'maint-1.7.6' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'maint-1.7.5' into maint-1.7.6
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'maint-1.7.4' into maint-1.7.5
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'maint-1.7.3' into maint-1.7.4
blob
|
diff
|
raw
|
diff to current
2011-10-26
Merge branch 'sn/doc-update-index-assume-unchanged...
blob
|
diff
|
raw
|
diff to current
2011-10-24
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2011-10-24
Merge branch 'maint-1.7.3' into maint
blob
|
diff
|
raw
|
diff to current
2011-10-24
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'po/insn-editor'
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'jc/broken-ref-dwim-fix'
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'mh/ref-api'
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'jc/match-refs-clarify'
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'jc/make-tags'
blob
|
diff
|
raw
|
diff to current
2011-10-21
Merge branch 'ss/inet-ntop'
blob
|
diff
|
raw
|
diff to current
next