tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Make 'unpack_trees()' have a separate source and destination index
[git.git]
/
merge-index.c
2008-03-09
Junio C Hamano
Merge branch 'kb/maint-filter-branch-disappear'
blob
|
commitdiff
|
raw
2008-03-09
Junio C Hamano
Merge branch 'maint' to sync with 1.5.4.4
blob
|
commitdiff
|
raw
2008-03-08
Junio C Hamano
Merge branch 'aw/maint-shortlog-blank-lines'
blob
|
commitdiff
|
raw
2008-03-08
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-06
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-03
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'pb/cvsimport'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'jc/maint-log-merge-left-right'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'mh/maint-http-proxy-fix'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'mk/maint-parse-careful'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'ew/maint-svn-cert-fileprovider'
blob
|
commitdiff
|
raw
2008-03-02
Junio C Hamano
Merge branch 'js/maint-daemon'
blob
|
commitdiff
|
raw
2008-03-01
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2008-03-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-03-01
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'js/branch-track'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'db/checkout'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'db/cover-letter'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'js/merge'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'jc/diff-relative'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'db/push-single-with-HEAD'
blob
|
commitdiff
|
raw
2008-02-27
Junio C Hamano
Merge branch 'db/host-alias'
blob
|
commitdiff
|
raw
2008-02-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-02-25
Junio C Hamano
Merge branch 'lt/dirstat'
blob
|
commitdiff
|
raw
2008-02-25
Junio C Hamano
Merge branch 'jc/apply-whitespace'
blob
|
commitdiff
|
raw
2008-02-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-02-23
Junio C Hamano
Sync with 1.5.4.3
blob
|
commitdiff
|
raw
2008-02-23
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-23
Junio C Hamano
Merge branch 'bc/reflog-fix' into js/reflog-delete
blob
|
commitdiff
|
raw
2008-02-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2008-02-22
Gerrit Pape
git-merge-index documentation: clarify synopsis
blob
|
commitdiff
|
raw
2008-02-21
Junio C Hamano
Merge branch 'js/maint-cvsexport'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'js/maint-http-push'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'jk/empty-tree'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'mc/prefix'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'jc/setup'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-19
Junio C Hamano
Merge branch 'mk/maint-parse-careful'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-18
Junio C Hamano
Merge branch 'br/gitweb'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'bd/qsort'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'sp/safecrlf'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'cc/browser'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'jc/gitignore-ends-with-slash'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'pb/prepare-commit-msg'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'jk/noetcconfig'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'jc/submittingpatches'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-02-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-02-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-02-12
Junio C Hamano
Merge branch 'db/no-separate-ls-remote-connection'...
blob
|
commitdiff
|
raw
|
diff to current
2008-02-12
Junio C Hamano
Merge branch 'mw/send-email'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-12
Junio C Hamano
Merge branch 'db/send-email-omit-cc'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-12
Junio C Hamano
Merge branch 'jc/error-message-in-cherry-pick'
blob
|
commitdiff
|
raw
|
diff to current
2008-02-12
Junio C Hamano
Merge branch 'lt/in-core-index'
blob
|
commitdiff
|
raw
|
diff to current
2008-01-24
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Linus Torvalds
Make on-disk index representation separate from in...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2008-01-21
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-11
Junio C Hamano
Merge ../gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-09
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2008-01-05
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-12-07
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-11-21
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-10-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-10-21
Shawn O. Pearce
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-09-18
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-08-29
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-27
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-08-26
J. Bruce Fields
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-21
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-19
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-08-19
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-16
Junio C Hamano
Merge branch 'maint' to sync with 1.5.2.5
blob
|
commitdiff
|
raw
|
diff to current
2007-08-13
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-08-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-05
J. Bruce Fields
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-08-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-30
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-07-28
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-14
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'master' of git://git./gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge commit 'git-gui/master'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-07-10
Shawn O. Pearce
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-07
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-07-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
next