tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
git svn: attempt to create empty dirs on clone+rebase
[git.git]
/
builtin-merge.c
2009-11-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-format-patch-p-suppress-stat'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'pb/maint-gitweb-blob-lineno'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'tr/describe-advice'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-i'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'bg/merge-ff-only'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'vl/maint-openssl-signature-change'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jk/maint-push-config'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jk/gitignore-anchored'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'jp/dirty-describe'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Junio C Hamano
Merge branch 'sr/blame-incomplete'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-10
Jonathan Nieder
merge: do not setup worktree twice
blob
|
commitdiff
|
raw
|
diff to current
2009-11-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-07
Junio C Hamano
Merge branch 'jc/commit-s-subject-is-not-a-footer'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-02
Junio C Hamano
Merge branch 'jn/show-normalized-refs'
blob
|
commitdiff
|
raw
|
diff to current
2009-11-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-31
Junio C Hamano
fixup tr/stash-format merge
blob
|
commitdiff
|
raw
|
diff to current
2009-10-31
Junio C Hamano
Merge branch 'jc/maint-1.6.3-graft-trailing-space'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-31
Junio C Hamano
Merge branch 'tr/maint-roff-quote'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-30
Björn Gustavsson
Teach 'git merge' and 'git pull' the option --ff-only
blob
|
commitdiff
|
raw
|
diff to current
2009-10-28
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-27
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-25
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'jp/maint-send-email-fold' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'...
blob
|
commitdiff
|
raw
|
diff to current
2009-10-24
Junio C Hamano
Merge branch 'pv/maint-add-p-no-exclude' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-20
Thomas Rast
Refactor pretty_print_commit arguments into a struct
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jp/maint-send-email-fold'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jn/maint-1.6.3-check-ref-format-doc'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-19
Junio C Hamano
Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-17
Junio C Hamano
Merge branch 'jc/maint-blank-at-eof'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-17
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-14
Junio C Hamano
Merge branch 'pv/maint-add-p-no-exclude'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-13
Junio C Hamano
Merge branch 'maint-1.6.4' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-10-09
Junio C Hamano
Merge branch 'rs/maint-archive-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-10-04
Junio C Hamano
Merge branch 'jc/maint-1.6.4-show-branch-default' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-09-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge 1.6.4.4 in
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'jc/maint-unpack-objects-strict' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'jk/maint-1.6.3-checkout-unborn' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-16
Junio C Hamano
Merge branch 'jc/maint-checkout-index-to-prefix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-15
Junio C Hamano
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-14
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-13
Junio C Hamano
Merge branch 'db/vcs-helper'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-13
Junio C Hamano
Merge branch 'cb/maint-1.6.3-grep-relative-up' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-09-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-07
Junio C Hamano
Merge branch 'tr/reset-checkout-patch'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-07
Junio C Hamano
Merge branch 'np/maint-1.6.3-deepen'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.3' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.3' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-09-03
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-09-01
Junio C Hamano
Merge branch 'mr/gitweb-snapshot'
blob
|
commitdiff
|
raw
|
diff to current
2009-09-01
Junio C Hamano
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Sync with 1.6.4.2
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'jk/maint-1.6.3-checkout-unborn'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'np/maint-1.6.3-deepen'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'jc/shortstatus'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-29
Junio C Hamano
Merge branch 'rc/maint-http-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.3' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
commitdiff
|
raw
|
diff to current
2009-08-28
Junio C Hamano
Merge branch 'lt/block-sha1'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-27
Junio C Hamano
Merge branch 'as/maint-graph-interesting-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-27
Junio C Hamano
Merge branch 'jc/maint-unpack-objects-strict'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-27
Junio C Hamano
Merge branch 'nd/sparse' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-08-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-26
Junio C Hamano
Merge branch 'js/maint-cover-letter-non-ascii' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-26
Junio C Hamano
Merge branch 'jc/maint-clean-nested-dir-safety' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-26
Junio C Hamano
Merge branch 'jk/maint-merge-msg-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-08-26
Junio C Hamano
Merge branch 'maint-1.6.3' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-08-26
Junio C Hamano
Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-08-25
Junio C Hamano
Merge branch 'aj/fix-read-tree-from-scratch'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-25
Junio C Hamano
Merge branch 'jc/maint-checkout-index-to-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-25
Junio C Hamano
Merge branch 'jl/submodule-summary-diff-files'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-25
Junio C Hamano
Merge branch 'oa/stash-na'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-24
Junio C Hamano
Merge branch 'jc/verify-pack-stat'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-24
Junio C Hamano
Merge branch 'mr/gitweb-xz'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-24
Junio C Hamano
Merge branch 'ld/p4'
blob
|
commitdiff
|
raw
|
diff to current
2009-08-22
Junio C Hamano
Sync with 1.6.4.1
blob
|
commitdiff
|
raw
|
diff to current
2009-08-22
Junio C Hamano
Merge branch 'cc/replace'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
