tokkee.org
Code
projects
/
git.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
checkout -m path: fix recreating conflicts
2010-01-06
Junio C Hamano
checkout -m path: fix recreating conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
GIT 1.6.1-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Include git-gui--askpass in git-gui RPM package
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Merge git://repo.or.cz/git-gui
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
send-email: do not reverse the command line arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Update draft release notes to 1.6.0.5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Merge branch 'st/maint-tag' into maint
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Merge branch 'mk/maint-cg-push' into maint
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'cc/bisect-skip'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'js/mingw-rename-fix'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'st/levenshtein'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'cr/remote-update-v'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'rs/strbuf-expand'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'mv/clone-strbuf'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'lt/preload-lstat'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'ta/quiet-pull'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'ph/send-email'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-28
Junio C Hamano
Merge branch 'mv/fast-export' into maint
commit
|
commitdiff
|
tree
2008-11-27
Junio C Hamano
Merge branch 'pw/maint-p4' into maint
commit
|
commitdiff
|
tree
2008-11-27
Junio C Hamano
Merge branch 'rw/maint-typofix' into rw/typofix
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Merge branch 'mm/sort-config-doc'
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Merge branch 'mm/maint-sort-config-doc' into maint
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Merge branch 'mm/maint-sort-config-doc' into mm/sort...
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Teach "git diff" to honour --[no-]ext-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Merge branch 'for-junio' of git://source.winehq.org...
commit
|
commitdiff
|
tree
2008-11-24
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-17
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-17
Junio C Hamano
builtin-remote.c: plug a small memory leak in get_one_remote...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-16
Junio C Hamano
Merge git://repo.or.cz/git-gui
commit
|
commitdiff
|
tree
2008-11-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-16
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
commit
|
commitdiff
|
tree
2008-11-16
Junio C Hamano
Merge branch 'jk/commit-v-strip'
commit
|
commitdiff
|
tree
2008-11-16
Junio C Hamano
Teach ls-files --with-tree=<tree> to work with options...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-16
Junio C Hamano
builtin-ls-files.c: coding style fix.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-15
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-14
Junio C Hamano
Merge git://git.bogomips.org/git-svn
commit
|
commitdiff
|
tree
2008-11-14
Junio C Hamano
Merge git://git.bogomips.org/git-svn
commit
|
commitdiff
|
tree
2008-11-14
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Update draft release notes to 1.6.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'jn/gitweb-customlinks'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'gb/gitweb-snapshot-pathinfo'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'ds/uintmax-config' (early part)
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'np/pack-safer'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'mk/maint-cg-push'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'bc/maint-keep-pack'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'mv/remote-rename'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'jk/deny-push-to-current'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'dl/xdiff'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'lt/decorate'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'jk/diff-convfilter'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'jk/diff-convfilter-test-fix'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge branch 'st/tag'
commit
|
commitdiff
|
tree
2008-11-13
Junio C Hamano
Merge git://repo.or.cz/git-gui
commit
|
commitdiff
|
tree
2008-11-12
Junio C Hamano
git.html: Update the links to stale versions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-12
Junio C Hamano
Start 1.6.0.5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Junio C Hamano
checkout: Fix "initial checkout" detection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Junio C Hamano
Merge branch 'jk/maint-commit-v-strip' into jk/commit...
commit
|
commitdiff
|
tree
2008-11-11
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-11
Junio C Hamano
Makefile: help people who run 'make check' by mistake
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
t5303: fix printf format string for portability
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
t5303: work around printf breakage in dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
GIT 1.6.0.4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'cb/maint-update-ref-fix' into maint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'ar/maint-mksnpath' into maint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'mv/maint-branch-m-symref' into maint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'ds/autoconf'
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
Merge branch 'rs/blame'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Update draft release notes to 1.6.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Merge branch 'ar/mksnpath'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Merge branch 'jc/gitweb-fix-cloud-tag'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Merge branch 'mv/maint-branch-m-symref'
commit
|
commitdiff
|
tree
2008-11-05
Junio C Hamano
Merge branch 'mv/parseopt-checkout-index'
commit
|
commitdiff
|
tree
2008-11-04
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
format-patch documentation: mention the special case...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
Update draft release notes to 1.6.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
Merge branch 'np/index-pack'
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
Merge branch 'sh/rebase-i-p'
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
Merge branch 'ag/blame-encoding'
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
Merge branch 'gb/gitweb-pathinfo'
commit
|
commitdiff
|
tree
2008-11-03
Junio C Hamano
Merge branch 'cj/maint-gitpm-fix-maybe-self'
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Update draft 1.6.0.4 release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Merge branch 'js/maint-fetch-update-head' into maint
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Merge branch 'jk/maint-ls-files-other' into maint
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Merge branch 'jc/maint-reset-remove-unmerged-new' into...
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Merge branch 'jc/maint-co-track' into maint
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Update draft release notes to 1.6.1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Stop using compat/regex.c on platforms with working...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Start 1.6.0.4 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
