tokkee.org
Code
projects
/
git.git
/ search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'il/maint-xmallocz'
2010-01-17
Junio C Hamano
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/clone-v-progress'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'tc/smart-http-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'jk/run-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Update COPYING with GPLv2 with new FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficiently_given(): refactor the logic...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
user_ident_sufficiently_given(): refactor the logic...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: honor conflict-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepare for customizable conflict marker length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit.c::print_summary: do not release the format...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conflict-marker-size: new attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: use ll_merge() instead of using xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree: use ll_merge() not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): allow passing down marker_size in xmparam_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): introduce xmparam_t for merge specific...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
git_attr(): fix function signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Teach diff that modified submodule directory is dirty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep --no-index: allow use of "git grep" outside a...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep: prepare to run outside of a work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'rs/maint-archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addbuf(): allow passing the same buf to dst...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'nd/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
t7502: test commit.status, --status and --no-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out pessimization to use fixmatch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out support for external grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
strbuf.c: remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
sha1_file.c: remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
mailmap.c: remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
utf8.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
submodule.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
quote.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
remote-curl.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
read-cache.c: mark file-local functions static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
parse-options.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
entry.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
http.c: mark file-local functions static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
grep: optimize built-in grep by skipping lines that...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
grep: -L should show empty files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
pretty.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
builtin-rev-list.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
bisect.c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere forget path: forget recorded resolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere: refactor rerere logic to make it independent...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
ident.c: treat $EMAIL as giving user.email identity...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
ident.c: check explicit identity for name and email...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'tr/http-updates'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'jk/maint-1.6.5-reset-hard'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'jk/push-to-delete'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'mm/config-path'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'pm/cvs-environ'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule...
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'bg/maint-remote-update-default'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'mm/diag-path-in-treeish'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'fc/opt-quiet-gc-reset'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
ls-files: fix overeager pathspec optimization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
read_directory(): further split treat_path()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
read_directory_recursive(): refactor handling of a...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
t3001: test ls-files -o ignored/dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-08
Junio C Hamano
ident.c: remove unused variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Describe second batch for 1.7.0 in draft release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch 'js/filter-branch-prime'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch 'sb/maint-octopus'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch 'mg/tag-d-show'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch 'so/cvsserver-update'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch 'bg/maint-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch 'mv/commit-date'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branch 'mo/bin-wrappers'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
read-tree --debug-unpack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
unpack-trees.c: look ahead in the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
unpack-trees.c: prepare for looking ahead in the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
checkout -m: do not try to fall back to --merge from...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Hamano
checkout -m path: fix recreating conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Hamano
.gitattributes: detect 8-space indent in shell scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Fix bit assignment for CE_CONFLICTED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Aggressive three-way merge: fix D/F case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
traverse_trees(): handle D/F conflict case sanely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
more D/F conflict tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
tests: move convenience regexp to match object names...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
"reset --merge": fix unmerged case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
Merge branch 'maint-1.6.0' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
branch -d: base the "already-merged" safety on the...
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.1' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1
commit
|
commitdiff
|
tree
2009-12-29
Junio C Hamano
Remove http.authAny
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-28
Junio C Hamano
Merge branch 'jk/1.7.0-status'
commit
|
commitdiff
|
tree
next