Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
Documentation: explain push.default option a bit more
[gitweb.git]
/
Documentation
/
merge-options.txt
2012-02-21
Merge branch 'maint'
blob
|
diff
|
raw
2012-02-21
Merge branch 'jk/git-dir-lookup' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-21
Merge branch 'cb/maint-t5541-make-server-port-portable...
blob
|
diff
|
raw
|
diff to current
2012-02-20
Merge branch 'tg/tag-points-at'
blob
|
diff
|
raw
2012-02-20
Merge branch 'jc/diff-stat-scaler'
blob
|
diff
|
raw
2012-02-20
Merge branch 'zj/decimal-width'
blob
|
diff
|
raw
2012-02-20
Merge branch 'zj/term-columns'
blob
|
diff
|
raw
2012-02-20
Merge branch 'cb/transfer-no-progress'
blob
|
diff
|
raw
2012-02-20
Merge branch 'cb/receive-pack-keep-errors'
blob
|
diff
|
raw
2012-02-20
Merge branch 'cb/maint-t5541-make-server-port-portable'
blob
|
diff
|
raw
2012-02-20
Merge branch 'cb/maint-rev-list-verify-object'
blob
|
diff
|
raw
2012-02-20
Merge branch 'maint'
blob
|
diff
|
raw
2012-02-16
Sync with maint
blob
|
diff
|
raw
2012-02-16
Merge branch 'jc/checkout-out-of-unborn' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-16
Merge branch 'jc/maint-mailmap-output' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-16
Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-16
Merge branch 'mm/empty-loose-error-message' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-14
Merge branch 'jk/git-dir-lookup'
blob
|
diff
|
raw
2012-02-14
Merge branch 'jk/grep-binary-attribute'
blob
|
diff
|
raw
2012-02-14
Merge branch 'nd/pack-objects-parseopt'
blob
|
diff
|
raw
2012-02-14
Merge branch 'dp/i18n-libcharset'
blob
|
diff
|
raw
2012-02-14
Merge branch 'bl/gitweb-project-filter'
blob
|
diff
|
raw
2012-02-14
Merge branch 'jn/ancient-meld-support'
blob
|
diff
|
raw
2012-02-14
Sync with 1.7.9.1
blob
|
diff
|
raw
2012-02-14
Merge branch 'jk/maint-tag-show-fixes' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-14
Merge branch 'bw/inet-pton-ntop-compat' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-13
Sync with maint
blob
|
diff
|
raw
2012-02-13
Merge branch 'js/add-e-submodule-fix' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-13
Merge branch 'jc/parse-date-raw' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-13
Merge branch 'jc/checkout-out-of-unborn'
blob
|
diff
|
raw
2012-02-13
Merge branch 'jc/maint-mailmap-output'
blob
|
diff
|
raw
2012-02-13
Merge branch 'jk/prompt-fallback-to-tty'
blob
|
diff
|
raw
2012-02-13
Merge branch 'jn/gitweb-search-utf-8'
blob
|
diff
|
raw
2012-02-13
Merge branch 'nd/diffstat-gramnum'
blob
|
diff
|
raw
2012-02-13
Merge branch 'nd/find-pack-entry-recent-cache-invalidation'
blob
|
diff
|
raw
2012-02-13
Merge branch 'tt/profile-build-fix'
blob
|
diff
|
raw
2012-02-13
Merge branch 'nd/cache-tree-api-refactor'
blob
|
diff
|
raw
2012-02-13
Merge branch 'fc/zsh-completion'
blob
|
diff
|
raw
2012-02-13
Merge branch 'mp/make-cleanse-x-for-exe'
blob
|
diff
|
raw
2012-02-13
Merge branch 'bw/inet-pton-ntop-compat'
blob
|
diff
|
raw
2012-02-13
Merge branch 'jc/maint-commit-ignore-i-t-a'
blob
|
diff
|
raw
2012-02-13
Merge branch 'jk/maint-tag-show-fixes'
blob
|
diff
|
raw
2012-02-13
Merge branch 'mm/empty-loose-error-message'
blob
|
diff
|
raw
2012-02-13
Merge branch 'nk/ctype-for-perf'
blob
|
diff
|
raw
2012-02-13
Merge branch 'jn/merge-no-edit-fix'
blob
|
diff
|
raw
2012-02-10
Merge branch 'js/add-e-submodule-fix'
blob
|
diff
|
raw
2012-02-10
Merge branch 'jc/parse-date-raw'
blob
|
diff
|
raw
2012-02-10
Merge branch 'jc/merge-ff-only-stronger-than-signed...
blob
|
diff
|
raw
2012-02-10
Merge branch 'jc/branch-desc-typoavoidance'
blob
|
diff
|
raw
2012-02-10
Merge branch 'jn/rpm-spec'
blob
|
diff
|
raw
2012-02-10
Merge branch 'jk/tests-write-script'
blob
|
diff
|
raw
2012-02-10
Sync with maint
blob
|
diff
|
raw
2012-02-10
Merge branch 'jl/submodule-re-add' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-10
Merge branch 'da/maint-mergetool-twoway' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-07
Merge branch 'jc/maint-request-pull-for-tag'
blob
|
diff
|
raw
2012-02-07
Merge branch 'bl/gitweb-project-filter'
blob
|
diff
|
raw
2012-02-07
Merge branch 'jx/i18n-more-marking'
blob
|
diff
|
raw
2012-02-07
Merge branch 'jn/svn-fe'
blob
|
diff
|
raw
2012-02-07
Merge branch 'rt/completion-branch-edit-desc'
blob
|
diff
|
raw
2012-02-06
Sync with maint
blob
|
diff
|
raw
2012-02-06
Merge branch 'sp/smart-http-failure-to-push' into maint
blob
|
diff
|
raw
|
diff to current
2012-02-06
Merge branch 'jc/maint-log-first-parent-pathspec' into...
blob
|
diff
|
raw
|
diff to current
2012-02-06
Sync with 1.7.6.6
blob
|
diff
|
raw
|
diff to current
2012-02-01
Merge branch 'tr/merge-edit-guidance'
blob
|
diff
|
raw
2012-02-01
Merge branch 'jc/pull-signed-tag'
blob
|
diff
|
raw
2012-02-01
Merge branch 'da/maint-mergetool-twoway'
blob
|
diff
|
raw
|
diff to current
2012-02-01
Merge branch 'jl/submodule-re-add'
blob
|
diff
|
raw
|
diff to current
2012-02-01
Merge branch 'ks/sort-wildcard-in-makefile'
blob
|
diff
|
raw
|
diff to current
2012-01-29
Merge branch 'rs/diff-postimage-in-context'
blob
|
diff
|
raw
|
diff to current
2012-01-29
Merge branch 'sp/smart-http-failure-to-push'
blob
|
diff
|
raw
|
diff to current
2012-01-29
Merge branch 'jc/maint-log-first-parent-pathspec'
blob
|
diff
|
raw
|
diff to current
2012-01-29
Merge branch 'tr/maint-mailinfo'
blob
|
diff
|
raw
|
diff to current
2012-01-27
Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
blob
|
diff
|
raw
|
diff to current
2012-01-23
merge: use editor by default in interactive sessions
blob
|
diff
|
raw
2012-01-18
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2012-01-18
Merge branch 'jk/credentials'
blob
|
diff
|
raw
|
diff to current
2012-01-18
Merge branch 'mh/maint-show-ref-doc'
blob
|
diff
|
raw
|
diff to current
2012-01-18
Merge branch 'tr/maint-word-diff-incomplete-line'
blob
|
diff
|
raw
|
diff to current
2012-01-13
Merge branch 'jc/request-pull-show-head-4'
blob
|
diff
|
raw
|
diff to current
2012-01-13
Merge branch 'tr/maint-mailinfo'
blob
|
diff
|
raw
|
diff to current
2012-01-13
Merge branch 'jk/maint-upload-archive'
blob
|
diff
|
raw
|
diff to current
2012-01-13
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2012-01-12
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2012-01-10
Merge the attributes fix in from maint-1.6.7 branch
blob
|
diff
|
raw
|
diff to current
2012-01-09
Merge branch 'jk/credentials'
blob
|
diff
|
raw
|
diff to current
2012-01-09
Merge branch 'mm/maint-gitweb-project-maxdepth'
blob
|
diff
|
raw
|
diff to current
2012-01-06
Merge branch 'jc/show-sig'
blob
|
diff
|
raw
|
diff to current
2012-01-06
Merge branch 'jn/maint-gitweb-utf8-fix' into maint
blob
|
diff
|
raw
|
diff to current
2012-01-06
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2012-01-04
Merge branch 'nd/maint-parse-depth' into maint
blob
|
diff
|
raw
|
diff to current
2012-01-03
Merge branch 'maint-1.7.7' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jv/maint-config-set' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jc/checkout-m-twoway' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'tr/doc-sh-setup' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jk/maint-strbuf-missing-init' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jk/maint-push-v-is-verbose' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jn/maint-sequencer-fixes' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jk/maint-snprintf-va-copy' into maint
blob
|
diff
|
raw
|
diff to current
2011-12-28
Merge branch 'jk/maint-mv' into maint
blob
|
diff
|
raw
|
diff to current
next