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 'ab/test-2'
2010-08-22
Junio C Hamano
Merge branch 'mm/shortopt-detached'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'sr/local-config'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'nd/fix-sparse-checkout'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'hv/submodule-find-ff-merge'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'en/rebase-against-rebase-fix'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'dg/local-mod-error-messages'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'po/userdiff-csharp'
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'ab/perl-install'
commit
|
commitdiff
|
tree
2010-08-22
Ævar Arnfjörð Bjarmason
reset: suggest what to do upon "git reset --mixed ...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Nieder
apply: handle traditional patches with space in filename
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Nieder
tests: exercise "git apply" with weird filenames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jonathan Nieder
apply: split quoted filename handling into new function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jens Lehmann
t7403: add missing &&'s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Mark Rada
Tell ignore file about generate files in /gitweb/static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-22
Jeff King
docs: fix Makefile dependency for user manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: remove stray backslash in show-branch...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: remove stray backslashes from "Fighting...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: do not convert ... operator to ellipses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: avoid stray backslash in user manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: avoid stray backslashes in core tutorial
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: remove stray backslashes in rev-parse...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: remove backslash before ~ in fast-import...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: remove stray backslash from "git bundle...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation/technical: avoid stray backslash in parse...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: remove backslashes in manpage synopses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: clarify quoting in gitignore docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: clarify quoting in "git rm" example
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: add missing quotes to "git grep" examples
Cc:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: clarify quoting in "git add" example
Cc:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: unbreak regex in show-ref manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: quoting trouble in "git rm" discussion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: tweak description of log.date
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Charles Bailey
mergetool: Remove explicit references to /dev/tty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'jc/maint-follow-rename-fix' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'jn/maint-plug-leak' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'jn/fix-abbrev' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'vs/doc-spell' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'jn/rebase-rename-am' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'jn/doc-pull' into maint
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'bc/use-more-hardlinks-in-install' into...
commit
|
commitdiff
|
tree
2010-08-20
Junio C Hamano
Merge branch 'tr/rfc-reset-doc' into maint
commit
|
commitdiff
|
tree
2010-08-20
Ramkumar Ramachandra
builtin/checkout: Fix message when switching to an...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Jonathan Nieder
Documentation: set a !DOCTYPE for user manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Matthieu Moy
xmalloc: include size in the failure message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-20
Elijah Newren
merge-recursive: Avoid excessive output for and reprocessing...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge branch 'maint' to sync with 1.7.2.2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Git 1.7.2.2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge branch 'tr/xsize-bits' into maint
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix' into maint
commit
|
commitdiff
|
tree
2010-08-19
Jonathan Nieder
autoconf: don't use platform regex if it lacks REG_STARTEND
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Ævar Arnfjörð Bjarmason
t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
compat/regex: get rid of old-style definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Ævar Arnfjörð Bjarmason
t/t9010-svn-fe.sh: add an +x bit to this test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-19
Ævar Arnfjörð Bjarmason
compat/regex: define out variables only used under...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
commit
|
commitdiff
|
tree
2010-08-18
Frank Li
Change regerror() declaration from K&R style to ANSI...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
compat/regex: get the gawk regex engine to compile...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
compat/regex: use the regex engine from gawk for compat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: learn --[no-]rerere-autoupdate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: notice @{-1} shorthand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: handle --no-ff --no-commit correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: --ff-only to disallow true merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: handle many-way octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: handle -m --log correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: forbid merge -s index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: allow custom strategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: merge -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: improve log message subject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: refuse to merge during merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: tweak unmerged files message to match...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge script: --squash, --ff from unborn branch are...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg -m to override merge title
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-base --independent to print reduced parent list...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge-base --octopus to mimic show-branch --merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
Documentation: add a SEE ALSO section for merge-base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200 (fmt-merge-msg): style nitpicks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010 (merge-base): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): test merge from branch yet to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): check reflog entry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): do not launch gitk for --debug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): modernize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge: do not mistake (ancestor of) tag for branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
David Aguilar
submodule sync: Update "submodule.<name>.url"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
tests: fix syntax error in "Use advise() for hints...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jc/maint-follow-rename-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'tf/string-list-init'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'cc/find-commit-subject'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
cvs tests: do not touch test CVS repositories shipped...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t7105-reset-patch.sh: Add a PERL prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t9001-send-email.sh: convert setup code to tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t9001-send-email.sh: change from skip_all=* to prereq...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t9001-send-email.sh: Remove needless PROG=* assignment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t9600-cvsimport.sh: change from skip_all=* to prereq...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
lib-patch-mode tests: change from skip_all=* to prereq...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
t/t3701-add-interactive.sh: change from skip_all=*...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjörð Bjarmason
tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next