tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'maint'
[git.git]
/
builtin-merge.c
2009-02-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
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
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
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
2009-02-03
Junio C Hamano
Merge branch 'jk/maint-cleanup-after-exec-failure'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'ks/maint-mailinfo-folded'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'jc/maint-apply-fix'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'am/maint-push-doc'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'jc/maint-allow-uninteresting-missing'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'js/maint-rebase-i-submodule'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'jc/maint-split-diff-metainfo'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'sp/runtime-prefix'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'jk/signal-cleanup'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-02-01
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Sync with 1.6.1.2
blob
|
commitdiff
|
raw
2009-01-29
Junio C Hamano
Merge branch 'jc/maint-format-patch-o-relative' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'bs/maint-rename-populate-filespec' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-29
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-28
Junio C Hamano
Merge branch 'tr/previous-branch'
blob
|
commitdiff
|
raw
2009-01-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-01-27
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-27
Junio C Hamano
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-26
Junio C Hamano
Merge branch 'kb/lstat-cache'
blob
|
commitdiff
|
raw
2009-01-26
Junio C Hamano
Merge branch 'js/diff-color-words'
blob
|
commitdiff
|
raw
2009-01-26
Junio C Hamano
Merge branch 'cb/add-pathspec'
blob
|
commitdiff
|
raw
2009-01-26
Junio C Hamano
Merge branch 'js/maint-all-implies-HEAD'
blob
|
commitdiff
|
raw
2009-01-26
Junio C Hamano
Sync with 1.6.1.1
blob
|
commitdiff
|
raw
2009-01-24
Junio C Hamano
Merge branch 'js/patience-diff'
blob
|
commitdiff
|
raw
2009-01-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2009-01-24
Junio C Hamano
Merge branch 'cb/maint-unpack-trees-absense' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'tr/maint-no-index-fixes' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'jc/maint-format-patch' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-24
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-22
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'lt/maint-wrap-zlib'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'am/maint-push-doc'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'sg/maint-gitdir-in-subdir'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'jf/am-failure-report'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'rs/ctype'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'sb/hook-cleanup'
blob
|
commitdiff
|
raw
2009-01-22
Junio C Hamano
Merge branch 'jc/maint-format-patch-o-relative'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-21
Junio C Hamano
Merge branch 'bs/maint-rename-populate-filespec'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-20
Junio C Hamano
Merge branch 'kc/maint-diff-bwi-fix'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'ds/uintmax-config'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'jc/maint-format-patch'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'tr/maint-no-index-fixes'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-18
Stephan Beyer
Move run_hook() from builtin-commit.c into run-command...
blob
|
commitdiff
|
raw
2009-01-15
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-15
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-14
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-14
Junio C Hamano
Merge branch 'js/bundle-tags'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-14
Junio C Hamano
Merge branch 'cb/maint-unpack-trees-absense'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-13
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-13
Junio C Hamano
Merge branch 'ap/maint-apply-modefix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-13
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-12
Junio C Hamano
Merge branch 'jc/maint-do-not-switch-to-non-commit...
blob
|
commitdiff
|
raw
|
diff to current
2009-01-07
Junio C Hamano
Merge branch 'wp/add-p-goto'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-07
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
blob
|
commitdiff
|
raw
|
diff to current
2009-01-07
Junio C Hamano
Merge branch 'maint-1.5.6' into maint-1.6.0
blob
|
commitdiff
|
raw
|
diff to current
2009-01-03
Junio C Hamano
Merge branch 'jc/maint-do-not-switch-to-non-commit'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-03
Junio C Hamano
Merge branch 'ap/maint-apply-modefix'
blob
|
commitdiff
|
raw
|
diff to current
2009-01-01
Junio C Hamano
Merge branch 'cb/mergetool'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-29
Junio C Hamano
Merge branch 'lt/reset-merge'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-27
Junio C Hamano
Merge branch 'sp/maint-describe-all-tag-warning' into...
blob
|
commitdiff
|
raw
|
diff to current
2008-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-22
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-20
Junio C Hamano
Merge branch 'maint' to sync with GIT 1.6.0.6
blob
|
commitdiff
|
raw
|
diff to current
2008-12-20
Junio C Hamano
GIT 1.6.0.6
v1.6.0.6
blob
|
commitdiff
|
raw
|
diff to current
2008-12-18
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-15
Junio C Hamano
Merge branch 'cb/maint-merge-recursive-fix' into cb...
blob
|
commitdiff
|
raw
|
diff to current
2008-12-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-11
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-10
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-06
Junio C Hamano
Merge branch 'jc/am-options'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-05
Alex Riesen
Make some of fwrite/fclose/write/close failures visible
blob
|
commitdiff
|
raw
|
diff to current
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-02
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-12-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-29
Junio C Hamano
Merge branch 'nd/narrow' (early part) into jc/add-i-t-a
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'cc/bisect-skip'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'js/mingw-rename-fix'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'st/levenshtein'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'cr/remote-update-v'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'rs/strbuf-expand'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'mv/clone-strbuf'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'lt/preload-lstat'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'ta/quiet-pull'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-28
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-11-27
Junio C Hamano
Merge branch 'rw/maint-typofix' into rw/typofix
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
