tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Add warning about known issues to documentation of cvsimport
[git.git]
/
builtin-merge.c
2009-03-24
Junio C Hamano
Merge branch 'js/windows-tests'
blob
|
commitdiff
|
raw
2009-03-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-22
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'dm/maint-docco'
blob
|
commitdiff
|
raw
2009-03-22
Junio C Hamano
Merge branch 'mg/test-installed'
blob
|
commitdiff
|
raw
2009-03-22
Junio C Hamano
Sync with maint
blob
|
commitdiff
|
raw
2009-03-22
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'mg/maint-submodule-normalize-path' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'js/maint-1.6.0-path-normalize' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-22
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory' into maint...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-03-20
Junio C Hamano
Merge branch 'mv/parseopt-ls-files'
blob
|
commitdiff
|
raw
2009-03-20
Junio C Hamano
Merge branch 'fc/parseopt-config'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-18
Junio C Hamano
Merge branch 'jc/maint-1.6.0-read-tree-overlay'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-18
Junio C Hamano
Merge branch 'tr/maint-1.6.0-send-email-irt'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-18
Junio C Hamano
Merge branch 'kb/checkout-optim'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'js/maint-1.6.1-remote-remove-mirror'...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-13
Junio C Hamano
Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'js/maint-send-email' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'fg/maint-exclude-bq' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'en/maint-hash-object' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'mg/maint-submodule-normalize-path'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-11
Junio C Hamano
Merge branch 'jc/maint-1.6.0-keep-pack'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-08
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'en/maint-hash-object'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'jc/blame'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'fc/config-editor'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'js/send-email'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'sg/rerere-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'jw/imap-preformatted-html'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'jw/format-patch-attach'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'sr/force-rebase'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'fg/exclude-bq'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'dm/add-i-edit-abort'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'tp/completion'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'js/branch-symref'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'al/ansi-color'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-05
Junio C Hamano
Merge branch 'js/valgrind'
blob
|
commitdiff
|
raw
|
diff to current
2009-03-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2009-03-01
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-28
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-28
Junio C Hamano
Merge branch 'cc/maint-1.6.0-bisect-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-27
Junio C Hamano
Merge branch 'cc/maint-1.6.0-bisect-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-25
Junio C Hamano
Merge branch 'jc/maint-1.6.0-pack-directory'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-18
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-18
Johannes Schindelin
Turn the flags in struct dir_struct into a single variable
blob
|
commitdiff
|
raw
2009-02-15
Junio C Hamano
Merge branch 'mc/setup-cd-p'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-15
Junio C Hamano
Merge branch 'ff/submodule-no-fetch'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-15
Junio C Hamano
Merge branch 'ms/mailmap'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-15
Junio C Hamano
Merge branch 'jn/gitweb-committag'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-15
Junio C Hamano
Merge branch 'rc/http-push'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-15
Junio C Hamano
Merge branch 'js/gc-prune'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-15
Junio C Hamano
Merge branch 'tr/abbrev-commit-no-ellipses'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-15
Junio C Hamano
Merge branch 'jc/branch-previous'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-14
Junio C Hamano
Teach @{-1} to git merge
blob
|
commitdiff
|
raw
|
diff to current
2009-02-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-12
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'maint-1.5.6' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'js/maint-1.6.0-path-normalize'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-07
Junio C Hamano
Merge branch 'tr/add-p-single'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-07
Junio C Hamano
Merge branch 'js/filter-branch-submodule'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'js/maint-remote-remove-mirror'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'js/notes'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'jc/refuse-push-to-current'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'rc/http-push'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'gt/utf8-width'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'jk/head-symref'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'cb/mergetool'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'sg/maint-gitdir-in-subdir' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'lt/maint-wrap-zlib' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'js/maint-all-implies-HEAD' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-06
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-05
Junio C Hamano
Merge branch 'jc/fsck' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2009-02-04
Alexander Potashev
Replace deprecated dashed git commands in usage
blob
|
commitdiff
|
raw
|
diff to current
2009-02-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-04
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-04
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-03
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-02-03
Junio C Hamano
Merge branch 'jc/maint-add-u-remove-conflicted'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-03
Junio C Hamano
Merge branch 'jk/maint-cleanup-after-exec-failure'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-01
Junio C Hamano
Merge branch 'ks/maint-mailinfo-folded'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-01
Junio C Hamano
Merge branch 'jc/maint-apply-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-01
Junio C Hamano
Merge branch 'am/maint-push-doc'
blob
|
commitdiff
|
raw
|
diff to current
2009-02-01
Junio C Hamano
Merge branch 'jc/maint-allow-uninteresting-missing'
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
