tokkee.org
Code
projects
/
git.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
resolve-undo: record resolved conflicts in a new index extension section
2009-12-26
Junio C Hamano
resolve-undo: record resolved conflicts in a new index...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
builtin-merge.c: use standard active_cache macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Hamano
Git 1.6.6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Git 1.6.6-rc4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1.6.6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Merge branch 'maint' to sync with 1.6.5.7
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
Git 1.6.5.7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
worktree: don't segfault with an absolute pathspec...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Update Release Notes for 1.6.6 to remove old bugfixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
Junio C Hamano
Sync with 1.6.5.6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1.6.5.6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Fix archive format with -- on the command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Remove post-upload-hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hamano
Git 1.6.6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://repo.or.cz/git-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Update draft release notes to 1.6.6 before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'mm/maint-merge-ff-error-message-fix'...
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jn/maint-pull-rebase-error-message' into...
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge branch 'jk/maint-add-p-delete-fix' into maint
commit
|
commitdiff
|
tree
2009-12-09
Junio C Hamano
Merge git://git.bogomips.org/git-svn
commit
|
commitdiff
|
tree
2009-12-08
Junio C Hamano
Revert recent "git merge <msg> HEAD <commit>..." deprecation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Sync with 1.6.5.5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-05
Junio C Hamano
Git 1.6.5.5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Prepare for 1.6.5.5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'uk/maint-shortlog-encoding' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'fc/maint-format-patch-pathspec-dashes...
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'ap/maint-merge-strategy-list-fix' into...
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jc/maint-am-keep' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rs/work-around-grep-opt-insanity' into...
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-cygwin-count-objects' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm/maint-hint-failed-merge' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/maint-remote-update-help-string' into...
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-t9700' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'ls/maint-mailinfo-no-inbody' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mo/maint-crlf-doc' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'th/remote-usage' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'pb/maint-use-custom-perl' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'mm/config-pathname-tilde-expand' into...
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'bc/grep-i-F' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'jk/maint-break-rename-reduce-memory'...
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rj/maint-simplify-cygwin-makefile' into...
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'rg/doc-workflow' into maint
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'np/maint-sideband-favor-status' into...
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation: xmlto 0.0.18 does not know --stringparam
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge in 1.6.5.4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Git 1.6.5.4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Unconditionally set man.base.url.for.relative.links
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-03
Junio C Hamano
Documentation/Makefile: allow man.base.url.for.relative...
Signed-off-by:
Junio C Hamano
<junio@kernel.org>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Git 1.6.6-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Prepare for 1.6.5.4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
merge: do not add standard message when message is...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-02
Junio C Hamano
Do not misidentify "git merge foo HEAD" as an old-style...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Update draft release notes to 1.6.6 before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'jc/deprecate-old-syntax-from-merge'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
git-merge: a deprecation notice of the ancient command...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'bw/remote-get-ref-states-fix'
commit
|
commitdiff
|
tree
2009-12-01
Junio C Hamano
Merge branch 'jn/gitweb-blame'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc/maint-format-patch-pathspec-dashes'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'mm/maint-merge-ff-error-message-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'ap/maint-merge-strategy-list-fix'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'jc/pretty-lf'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'cc/bisect-doc'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'em/commit-claim'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'jc/mailinfo-remove-brackets'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'fc/send-email-envelope'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'uk/maint-shortlog-encoding'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'ns/send-email-no-chain-reply-to'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'jc/maint-am-keep'
commit
|
commitdiff
|
tree
2009-11-30
Junio C Hamano
Merge branch 'bw/diff-color-hunk-header'
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
Update draft release notes to 1.6.6 before merging...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-28
Junio C Hamano
emit_line(): don't emit an empty <SET><RESET> followed...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Remove dead code from "git am"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-27
Junio C Hamano
builtin-apply.c: pay attention to -p<n> when determining...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-25
Junio C Hamano
Merge branch 'rs/work-around-grep-opt-insanity'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'rj/maint-cygwin-count-objects'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'rs/color-escape-has-zero-width'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'bg/apply-doc'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'mm/maint-hint-failed-merge'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'jc/log-stdin'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'mr/gitweb-snapshot'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'cc/replace'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-24
Junio C Hamano
Protect scripted Porcelains from GREP_OPTIONS insanity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Add trivial tests for --stdin option to log family
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'bg/fetch-multi'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Git v1.6.6-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge git://git.bogomips.org/git-svn
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'th/maint-remote-update-help-string'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'jn/faster-completion-startup'
commit
|
commitdiff
|
tree
2009-11-23
Junio C Hamano
Merge branch 'rj/maint-t9700'
commit
|
commitdiff
|
tree
next
![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
