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 'jn/doc-backslash'
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
Merge branch 'jn/maint-plug-leak'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jl/submodule-ignore-diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'ml/rebase-x-strategy'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jn/fix-abbrev'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'vs/doc-spell'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jh/use-test-must-fail'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jh/clean-exclude'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'kf/post-receive-sample-hook'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'ab/report-corrupt-object-with-type'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jn/rebase-rename-am'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jn/fast-import-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'ar/string-list-foreach'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'jh/graph-next-line'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'tr/xsize-bits'
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-recursive: Fix multiple file rename across D...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t6031: Add a testcase covering multiple renames across...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-recursive: Fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'tc/checkout-B'
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip autoresolved paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Clemens Buchacher
hash binary sha1 into patch id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Petr Onderka
Userdiff patterns for C#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
t7006 (pager): add missing TTY prerequisites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái Ngọc Duy
merge-file: run setup_git_directory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái Ngọc Duy
var: run setup_git_directory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái Ngọc Duy
ls-remote: run setup_git_directory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái Ngọc Duy
index-pack: run setup_git_directory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Junio C Hamano
Merge branch 'jn/maint-setup-fix' (early part) into...
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái Ngọc Duy
config: run setup_git_directory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái Ngọc Duy
bundle: run setup_git_directory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái Ngọc Duy
apply: run setup_git_directory_gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ævar Arnfjörð Bjarmason
log: test for regression introduced in v1.7.2-rc0~103^2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
cherry-pick/revert: Use advise() for hints
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
cherry-pick/revert: Use error() for failure message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
Introduce advise() to print hints
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
Eliminate “Finished cherry-pick/revert” message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
t9010 (svn-fe): avoid symlinks in test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
t9010 (svn-fe): use Unix-style path in URI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
vcs-svn: Avoid %z in format string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
vcs-svn: Rename dirent pool to build on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
compat: add strtok_r()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
treap: style fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
vcs-svn: remove build artifacts on "make clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
svn-fe manual: Clarify warning about deltas in dump...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
Update svn-fe manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
SVN dump parser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Infrastructure to write revisions in fast-export format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Add stream helper library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Add string-specific memory pool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jason Evans
Add treap implementation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Add memory pool library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
Introduce vcs-svn lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Daniel Johnson
fetch: allow command line --tags to override config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Brandon Casey
git-rebase--interactive.sh: use printf instead of echo...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Brandon Casey
git-rebase--interactive.sh: rework skip_unnecessary_picks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
diff --follow: do call diffcore_std() as necessary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
diff --follow: do not waste cycles while recursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Ævar Arnfjörð Bjarmason
perl/Makefile: Unset INSTALL_BASE when making perl.mak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Mark tests that use symlinks as needing SYMLINKS prerequisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull --rebase: Avoid spurious conflicts and reapplying...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
t5520-pull: Add testcases showing spurious conflicts...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'jc/sha1-name-find-fix'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'jn/doc-pull'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'jn/maint-gitweb-dynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'bc/use-more-hardlinks-in-install'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'tr/rfc-reset-doc'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'jn/parse-date-basic'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'sp/fix-smart-http-deadlock-on-error'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-13
Matthieu Moy
push: mention "git pull" in error message for non-fast...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan Nieder
Standardize do { ... } while (0) style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Brandon Casey
t/t7003: replace \t with literal tab in sed expression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Nelson Elhage
index-pack: Don't follow replace refs.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next