Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
apply: use OPT_NOOP_NOARG
[gitweb.git]
/
builtin
/
merge.c
2011-09-26
Merge branch 'jc/namespace-doc-with-old-asciidoc'
blob
|
diff
|
raw
2011-09-23
Merge 1.7.6.4 in
blob
|
diff
|
raw
2011-09-23
Merge branch 'mh/check-ref-format-print-normalize'...
blob
|
diff
|
raw
|
diff to current
2011-09-23
Merge branch 'gb/maint-am-patch-format-error-message...
blob
|
diff
|
raw
|
diff to current
2011-09-20
Merge branch 'maint'
blob
|
diff
|
raw
2011-09-19
Merge branch 'ph/format-patch-no-color'
blob
|
diff
|
raw
2011-09-17
Merge branch 'ci/forbid-unwanted-current-branch-update'
blob
|
diff
|
raw
2011-09-15
Merge branch 'ph/format-patch-no-color'
blob
|
diff
|
raw
2011-09-12
Sync with 1.7.6.3
blob
|
diff
|
raw
2011-09-12
Merge branch 'maint'
blob
|
diff
|
raw
2011-09-12
Merge branch 'jk/tag-contains-ab' (early part) into...
blob
|
diff
|
raw
|
diff to current
2011-09-12
Merge branch 'jk/maint-config-param' into maint
blob
|
diff
|
raw
|
diff to current
2011-09-12
Merge branch 'jk/maint-1.7.2-status-ignored' into maint
blob
|
diff
|
raw
|
diff to current
2011-09-06
Merge branch 'rc/histogram-diff'
blob
|
diff
|
raw
2011-09-06
Merge branch 'cb/maint-ls-files-error-report'
blob
|
diff
|
raw
2011-09-06
Merge branch 'mh/check-ref-format-print-normalize'
blob
|
diff
|
raw
2011-09-06
Sync with 1.7.6.2
blob
|
diff
|
raw
2011-09-02
Merge branch 'js/i18n-scripts-2'
blob
|
diff
|
raw
2011-09-02
Merge branch 'tr/maint-t3903-misquoted-command'
blob
|
diff
|
raw
2011-09-02
Merge branch 'bc/bisect-test-use-shell-path'
blob
|
diff
|
raw
2011-09-02
Merge branch 'va/p4-branch-import-test-update'
blob
|
diff
|
raw
2011-09-02
Merge branch 'tr/maint-strbuf-grow-nul-termination'
blob
|
diff
|
raw
2011-09-02
Merge branch 'tr/maint-ident-to-git-memmove'
blob
|
diff
|
raw
2011-09-02
Merge branch 'tr/maint-format-patch-empty-output'
blob
|
diff
|
raw
2011-09-02
Merge branch 'gb/maint-am-stgit-author-to-from-fix'
blob
|
diff
|
raw
2011-09-02
Merge branch 'gb/maint-am-patch-format-error-message'
blob
|
diff
|
raw
2011-09-02
Merge branch 'ms/daemon-timeout-is-in-seconds'
blob
|
diff
|
raw
2011-09-02
Merge branch 'bg/t5540-osx-grep'
blob
|
diff
|
raw
2011-09-02
Merge branch 'jc/clean-exclude-doc'
blob
|
diff
|
raw
2011-09-02
Merge branch 'mg/maint-notes-C-doc'
blob
|
diff
|
raw
2011-09-02
Merge branch 'fg/submodule-ff-check-before-push'
blob
|
diff
|
raw
2011-09-02
Merge branch 'rc/diff-cleanup-records'
blob
|
diff
|
raw
2011-09-02
Merge branch 'fk/use-kwset-pickaxe-grep-f'
blob
|
diff
|
raw
2011-09-02
Merge branch 'en/merge-recursive-2'
blob
|
diff
|
raw
2011-08-30
Merge branch 'maint'
blob
|
diff
|
raw
2011-08-29
Merge branch 'nd/decorate-grafts'
blob
|
diff
|
raw
2011-08-29
Merge branch 'nd/maint-clone-gitdir'
blob
|
diff
|
raw
2011-08-29
Merge branch 'ci/forbid-unwanted-current-branch-update'
blob
|
diff
|
raw
2011-08-29
Merge branch 'jk/pager-with-external-command'
blob
|
diff
|
raw
2011-08-29
Merge branch 'jc/maint-clone-alternates'
blob
|
diff
|
raw
2011-08-29
Merge branch 'jk/color-and-pager'
blob
|
diff
|
raw
2011-08-29
Merge branch 'mh/attr'
blob
|
diff
|
raw
|
diff to current
2011-08-29
Merge branch 'di/fast-import-tagging'
blob
|
diff
|
raw
|
diff to current
2011-08-29
Merge branch 'di/fast-import-blob-tweak'
blob
|
diff
|
raw
|
diff to current
2011-08-29
Merge branch 'di/fast-import-deltified-tree'
blob
|
diff
|
raw
|
diff to current
2011-08-29
Merge branch 'di/fast-import-ident'
blob
|
diff
|
raw
|
diff to current
2011-08-29
Merge branch 'bw/doc-repo-layout'
blob
|
diff
|
raw
|
diff to current
2011-08-29
Merge branch 'va/p4-branch-import'
blob
|
diff
|
raw
|
diff to current
2011-08-29
Merge branch 'jc/combine-diff-callback'
blob
|
diff
|
raw
|
diff to current
2011-08-29
Merge branch 'nk/branch-v-abbrev'
blob
|
diff
|
raw
|
diff to current
2011-08-25
Merge branch 'jc/merge-reword'
blob
|
diff
|
raw
|
diff to current
2011-08-25
Merge branch 'jn/plug-empty-tree-leak'
blob
|
diff
|
raw
|
diff to current
2011-08-23
Merge branch 'jc/maint-combined-diff-work-tree' into...
blob
|
diff
|
raw
|
diff to current
2011-08-19
want_color: automatically fallback to color.ui
blob
|
diff
|
raw
|
diff to current
2011-08-18
diff: refactor COLOR_DIFF from a flag into an int
blob
|
diff
|
raw
|
diff to current
2011-08-18
Merge branch 'js/ref-namespaces'
blob
|
diff
|
raw
|
diff to current
2011-08-18
Merge branch 'jc/maint-combined-diff-work-tree'
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'jk/tag-list-multiple-patterns' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'jl/submodule-add-relurl-wo-upstream'...
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'jk/fast-export-quote-path' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'bw/log-all-ref-updates-doc' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'js/maint-add-path-stat-pwd' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'jn/mime-type-with-params' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'jc/submodule-sync-no-auto-vivify' into...
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'jc/zlib-wrap' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'jc/diff-index-quick-exit-early' into...
blob
|
diff
|
raw
|
diff to current
2011-08-16
Merge branch 'jk/combine-diff-binary-etc' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-11
Merge branch 'jk/fast-export-quote-path'
blob
|
diff
|
raw
|
diff to current
2011-08-11
Merge branch 'rc/maint-http-wrong-free'
blob
|
diff
|
raw
|
diff to current
2011-08-01
Merge branch 'jk/clone-detached'
blob
|
diff
|
raw
|
diff to current
2011-08-01
Merge branch 'jc/streaming-filter'
blob
|
diff
|
raw
|
diff to current
2011-08-01
Merge branch 'nk/ref-doc' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-01
Merge branch 'jl/maint-fetch-recursive-fix' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-01
Merge branch 'jc/maint-cygwin-trust-executable-bit...
blob
|
diff
|
raw
|
diff to current
2011-08-01
Merge branch 'jc/legacy-loose-object' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-01
Merge branch 'an/shallow-doc' into maint
blob
|
diff
|
raw
|
diff to current
2011-08-01
Merge branch 'jc/maint-1.7.3-checkout-describe' into...
blob
|
diff
|
raw
|
diff to current
2011-07-22
Merge branch 'dc/stash-con-untracked'
blob
|
diff
|
raw
|
diff to current
2011-07-22
Merge branch 'jk/tag-contains-ab'
blob
|
diff
|
raw
|
diff to current
2011-07-22
Merge branch 'bw/log-all-ref-updates-doc'
blob
|
diff
|
raw
|
diff to current
2011-07-22
Merge branch 'js/maint-add-path-stat-pwd'
blob
|
diff
|
raw
|
diff to current
2011-07-22
Merge branch 'jn/gitweb-search'
blob
|
diff
|
raw
|
diff to current
2011-07-22
Merge branch 'jl/submodule-add-relurl-wo-upstream'
blob
|
diff
|
raw
|
diff to current
2011-07-19
Merge branch 'jc/index-pack'
blob
|
diff
|
raw
|
diff to current
2011-07-19
Merge branch 'jn/mime-type-with-params'
blob
|
diff
|
raw
|
diff to current
2011-07-19
Merge branch 'jc/submodule-sync-no-auto-vivify'
blob
|
diff
|
raw
|
diff to current
2011-07-19
Merge branch 'jk/clone-cmdline-config'
blob
|
diff
|
raw
|
diff to current
2011-07-19
Merge branch 'jk/maint-config-param'
blob
|
diff
|
raw
|
diff to current
2011-07-19
Merge branch 'jk/tag-list-multiple-patterns'
blob
|
diff
|
raw
|
diff to current
2011-07-19
Merge branch 'jc/zlib-wrap'
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'js/rebase-typo-branch-squelch-usage'
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'nk/ref-doc'
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'jl/maint-fetch-recursive-fix'
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'jc/maint-cygwin-trust-executable-bit...
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'md/interix-update'
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'ln/gitweb-mime-types-split-at-blank'
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'jc/legacy-loose-object'
blob
|
diff
|
raw
|
diff to current
2011-07-13
Merge branch 'an/shallow-doc'
blob
|
diff
|
raw
|
diff to current
next