tokkee.org
Code
projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
mergetool: Clean up description of files and prompts for merge resolutions
[git.git]
/
merge-index.c
2007-03-26
Junio C Hamano
Merge branch 'jc/fpl'
blob
|
commitdiff
|
raw
2007-03-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-24
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-22
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-03-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2007-03-20
Junio C Hamano
Merge git://git2.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
2007-03-19
Junio C Hamano
Fix merge-index
blob
|
commitdiff
|
raw
2007-03-19
Junio C Hamano
Merge branch 'jb/gc'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-19
Junio C Hamano
Merge branch 'fl/cvsserver'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-19
Junio C Hamano
Merge branch 'sp/run-command'
blob
|
commitdiff
|
raw
|
diff to current
2007-03-13
Shawn O. Pearce
Use run_command within merge-index
blob
|
commitdiff
|
raw
|
diff to current
2007-03-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-03-12
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-03-06
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-03-05
Junio C Hamano
Merge branch 'js/fetch-progress' (early part)
blob
|
commitdiff
|
raw
|
diff to current
2007-03-02
Junio C Hamano
Merge branch 'js/commit-format'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-28
Junio C Hamano
Merge branch 'js/commit-by-name'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-28
Junio C Hamano
Merge branch 'js/bundle'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-28
Junio C Hamano
Merge branch 'mc/sendmail'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-27
Junio C Hamano
Merge branch 'np/types' into jc/fetch
blob
|
commitdiff
|
raw
|
diff to current
2007-02-26
Junio C Hamano
Merge branch 'master' into js/diff-ni
blob
|
commitdiff
|
raw
|
diff to current
2007-02-26
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-26
Junio C Hamano
Merge branch 'jc/merge-symlink' into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-02-26
Junio C Hamano
merge-index: fix longstanding bug in merging symlinks
blob
|
commitdiff
|
raw
|
diff to current
2007-02-25
Junio C Hamano
Merge git://repo.or.cz/git-gui into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-02-21
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui into...
blob
|
commitdiff
|
raw
|
diff to current
2007-02-18
Junio C Hamano
Merge git://git./pub/scm/gitk/gitk into maint
blob
|
commitdiff
|
raw
|
diff to current
2007-02-14
Junio C Hamano
Merge branch 'jc/diff-apply-patch'
blob
|
commitdiff
|
raw
|
diff to current
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-02-13
Junio C Hamano
Merge branch 'master' of git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-02-12
Junio C Hamano
Merge git-gui
blob
|
commitdiff
|
raw
|
diff to current
2007-01-15
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2007-01-14
Shawn O. Pearce
Merge branch 'master' into sp/fast-import
blob
|
commitdiff
|
raw
|
diff to current
2007-01-09
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2007-01-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-27
Junio C Hamano
Merge branch 'master' into js/shallow
blob
|
commitdiff
|
raw
|
diff to current
2006-12-25
Junio C Hamano
Merge branch 'jc/git-add--interactive'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-22
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-21
Junio C Hamano
Merge branch 'ew/svn-pm'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'jc/leftright'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'jc/blame'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'jc/branch-remove-remote'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'jc/clone'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-12-20
Junio C Hamano
simplify inclusion of system header files.
blob
|
commitdiff
|
raw
|
diff to current
2006-11-29
Junio C Hamano
Merge master.kernel.org:/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-11-24
Junio C Hamano
Merge branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-11-08
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-10-17
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-02
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-01
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-10-01
Junio C Hamano
Merge branch 'jc/gitpm'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-18
Junio C Hamano
Merge part of branch 'jc/upload-pack'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-14
Junio C Hamano
Merge branches 'maint' and 'jc/http'
blob
|
commitdiff
|
raw
|
diff to current
2006-09-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-08-28
Junio C Hamano
Merge branch 'js/c-merge-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-23
Junio C Hamano
Merge branch 'gl/cleanup' into gl/cleanup-next
blob
|
commitdiff
|
raw
|
diff to current
2006-08-21
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-17
Junio C Hamano
Merge branch 'jc/format-patch'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-16
Junio C Hamano
Merge branch 'jc/racy'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-16
David Rientjes
remove unnecessary initializations
blob
|
commitdiff
|
raw
|
diff to current
2006-08-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2006-08-15
David Rientjes
use appropriate typedefs
blob
|
commitdiff
|
raw
|
diff to current
2006-08-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-07-05
Junio C Hamano
Merge branch 'jc/sha1'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-29
Junio C Hamano
Merge branch 'jc/repack'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'jc/squash'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'jc/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'ml/cvsimport'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'js/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Junio C Hamano
Merge branch 'ew/rebase'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-26
Dennis Stosberg
Solaris needs inclusion of signal.h for signal()
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge branch 'js/lsfix'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge branch 'ew/rebase'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge branch 'jn/web'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge early parts of branch 'js/diff'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge branch 'jc/upload-corrupt'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge branch 'ew/rebase' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge branch 'jn/web' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge branch 'jc/waitpid'
blob
|
commitdiff
|
raw
|
diff to current
2006-06-22
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-21
Junio C Hamano
Merge branch 'jc/upload-corrupt' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-21
Junio C Hamano
Merge branch 'jn/web' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-21
Junio C Hamano
Merge branch 'ew/rebase' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-21
Junio C Hamano
Merge branch 'ff/c99' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-21
Junio C Hamano
Merge branch 'jc/upload-corrupt' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-21
Junio C Hamano
Merge branch 'jn/web' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-21
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-20
Junio C Hamano
Merge branch 'jn/web' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-20
Junio C Hamano
Merge branch 'jn/web' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-20
Junio C Hamano
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-20
Junio C Hamano
Merge branch 'jn/web' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-20
Junio C Hamano
Merge branch 'pb/config' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-20
Junio C Hamano
Merge branch 'jc/waitpid' into next
blob
|
commitdiff
|
raw
|
diff to current
2006-06-20
Junio C Hamano
Restore SIGCHLD to SIG_DFL where we care about waitpid().
blob
|
commitdiff
|
raw
|
diff to current
2006-06-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
2006-06-10
Junio C Hamano
Merge git://git.kernel.org/pub/scm/git/gitweb
blob
|
commitdiff
|
raw
|
diff to current
2006-06-07
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
commitdiff
|
raw
|
diff to current
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
