projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'tr/merge-edit-guidance' into maint
[git]
/
builtin
/
merge.c
2012-02-27
Junio C Hamano
Merge branch 'tr/merge-edit-guidance' into maint
blob
|
commitdiff
|
raw
2012-02-27
Junio C Hamano
Merge branch 'js/configure-libintl' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-27
Junio C Hamano
Sync with 1.7.8.5
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'cb/receive-pack-keep-errors' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'cb/transfer-no-progress' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'jk/git-dir-lookup' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'jc/diff-stat-scaler' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'zj/term-columns' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'cb/maint-rev-list-verify-object' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'cb/maint-t5541-make-server-port-portable...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'dp/i18n-libcharset' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'jk/grep-binary-attribute' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'nd/diffstat-gramnum' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'nd/find-pack-entry-recent-cache-invalidat...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'tt/profile-build-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-21
Junio C Hamano
Merge branch 'fc/zsh-completion' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'jc/checkout-out-of-unborn' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'jc/maint-mailmap-output' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'jk/prompt-fallback-to-tty' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'jn/gitweb-search-utf-8' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'mm/empty-loose-error-message' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'nk/ctype-for-perf' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'jx/i18n-more-marking' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-16
Junio C Hamano
Merge branch 'rt/completion-branch-edit-desc' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-14
Junio C Hamano
Merge branch 'jk/maint-tag-show-fixes' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-14
Junio C Hamano
Merge branch 'bw/inet-pton-ntop-compat' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-14
Junio C Hamano
Merge branch 'mp/make-cleanse-x-for-exe' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-14
Junio C Hamano
Merge branch 'jn/merge-no-edit-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-13
Junio C Hamano
Merge branch 'js/add-e-submodule-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-13
Junio C Hamano
Merge branch 'jc/parse-date-raw' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-13
Junio C Hamano
Merge branch 'jc/merge-ff-only-stronger-than-signed...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-10
Junio C Hamano
Merge branch 'tr/grep-l-with-decoration' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-10
Junio C Hamano
Merge branch 'jl/submodule-re-add' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-10
Junio C Hamano
Merge branch 'da/maint-mergetool-twoway' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-09
Junio C Hamano
merge: do not launch an editor on "--no-edit $tag"
blob
|
commitdiff
|
raw
|
diff to current
2012-02-06
Junio C Hamano
Merge branch 'sp/smart-http-failure-to-push' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-02-06
Junio C Hamano
Merge branch 'jc/maint-log-first-parent-pathspec' into...
blob
|
commitdiff
|
raw
|
diff to current
2012-02-06
Junio C Hamano
Sync with 1.7.6.6
blob
|
commitdiff
|
raw
|
diff to current
2012-02-06
Junio C Hamano
Sync with 1.7.6.6
blob
|
commitdiff
|
raw
|
diff to current
2012-02-06
Junio C Hamano
Sync with 1.7.6.6
blob
|
commitdiff
|
raw
|
diff to current
2012-02-06
Junio C Hamano
merge: do not create a signed tag merge under --ff...
blob
|
commitdiff
|
raw
|
diff to current
2012-01-31
Thomas Rast
merge: add instructions to the commit message when...
blob
|
commitdiff
|
raw
|
diff to current
2012-01-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-18
Junio C Hamano
Merge branch 'maint-1.7.7' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-01-18
Junio C Hamano
Merge branch 'jk/credentials'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-18
Junio C Hamano
Merge branch 'mh/maint-show-ref-doc'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-18
Junio C Hamano
Merge branch 'tr/maint-word-diff-incomplete-line'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-17
Junio C Hamano
Merge branch 'jn/maint-gitweb-grep-fix'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-13
Junio C Hamano
Merge branch 'jc/request-pull-show-head-4'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-13
Junio C Hamano
Merge branch 'tr/maint-mailinfo'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-13
Junio C Hamano
Merge branch 'ss/maint-msys-cvsexportcommit'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-13
Junio C Hamano
Merge branch 'jk/maint-upload-archive'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-13
Junio C Hamano
Merge branch 'maint-1.7.7' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-01-13
Junio C Hamano
Merge branch 'maint-1.7.6' into maint-1.7.7
blob
|
commitdiff
|
raw
|
diff to current
2012-01-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-12
Junio C Hamano
Merge branch 'maint-1.7.7' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-01-12
Junio C Hamano
Merge branch 'maint-1.7.6' into maint-1.7.7
blob
|
commitdiff
|
raw
|
diff to current
2012-01-10
Junio C Hamano
Merge branch 'bw/maint-t8006-sed-incomplete-line'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-10
Junio C Hamano
Sync with maint
blob
|
commitdiff
|
raw
|
diff to current
2012-01-10
Junio C Hamano
Merge the attributes fix in from maint-1.6.7 branch
blob
|
commitdiff
|
raw
|
diff to current
2012-01-10
Junio C Hamano
Merge the attributes fix in from maint-1.6.6 branch
blob
|
commitdiff
|
raw
|
diff to current
2012-01-09
Junio C Hamano
Merge branch 'jk/credentials'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-09
Junio C Hamano
Merge branch 'mh/ref-api-less-extra-refs'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-09
Junio C Hamano
Merge branch 'mm/maint-gitweb-project-maxdepth'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-06
Junio C Hamano
Merge branch 'jc/show-sig'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-06
Junio C Hamano
Sync with 1.7.8.3
blob
|
commitdiff
|
raw
|
diff to current
2012-01-06
Junio C Hamano
Merge branch 'jn/maint-gitweb-utf8-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-01-06
Junio C Hamano
Merge branch 'maint-1.7.7' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-01-06
Junio C Hamano
Merge branch 'maint-1.7.6' into maint-1.7.7
blob
|
commitdiff
|
raw
|
diff to current
2012-01-05
Junio C Hamano
Merge branch 'jc/signed-commit' and 'jc/pull-signed...
blob
|
commitdiff
|
raw
|
diff to current
2012-01-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-04
Junio C Hamano
Merge branch 'nd/maint-parse-depth' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-01-03
Junio C Hamano
Merge branch 'pw/p4-docs-and-tests'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2012-01-03
Junio C Hamano
Merge branch 'maint-1.7.7' into maint
blob
|
commitdiff
|
raw
|
diff to current
2012-01-03
Junio C Hamano
Merge branch 'maint-1.7.6' into maint-1.7.7
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Sync with 1.7.8.2
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jv/maint-config-set' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jk/follow-rename-score' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jc/checkout-m-twoway' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'tr/doc-sh-setup' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jk/maint-strbuf-missing-init' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jk/maint-push-v-is-verbose' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'ef/setenv-putenv' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jn/maint-sequencer-fixes' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jk/maint-snprintf-va-copy' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jk/maint-push-over-dav' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jk/maint-mv' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jk/fetch-no-tail-match-refs' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'ew/keepalive' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'ci/stripspace-docs' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jh/fast-import-notes' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'aw/rebase-i-stop-on-failure-to-amend...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'tj/maint-imap-send-remove-unused' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'jn/branch-move-to-self' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-12-28
Junio C Hamano
Merge branch 'na/strtoimax' into maint
blob
|
commitdiff
|
raw
|
diff to current
next
projects / git / history
Junio C Hamano
Thomas Rast