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/remote-fd-ext'
2010-11-17
Junio C Hamano
Merge branch 'kb/maint-diff-ws-check'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'bg/maint-gitweb-test-lib'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'jm/mailmap'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'tr/maint-git-repack-tmpfile'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'jk/maint-apply-no-binary'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'jk/push-progress'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'tr/maint-merge-file-subdir'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'jn/send-pack-error'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'mg/make-prove'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'kb/completion-checkout'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'sg/completion'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'sg/bisect'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'ak/submodule-sync'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'jk/maint-rev-list-nul'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'ks/no-textconv-symlink'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'jn/gitweb-test'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'cb/diff-fname-optim'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'jk/no-textconv-symlink'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'dk/maint-blame-el'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-11-17
Brian Gernhardt
t6022: Use -eq not = to test output of wc -l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Nguyễn Thái Ngọc Duy
clean: remove redundant variable baselen
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git merge --abort' as a synonym to 'git reset...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
cmd_merge(): Parse options before checking MERGE_HEAD
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Provide 'git notes get-ref' to easily retrieve current...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add testcases for merging notes trees...
-
Junio C Hamano
: Portability: Don't string-compare...
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add another auto-resolving strategy...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: --commit should fail if underlying...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List conflicting notes in notes merge...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual conflict resolution, part 2/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual conflict resolution, part 1/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentation: Preliminary docs on 'git notes merge'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Add automatic conflict resolvers ...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Handle real, non-conflicting notes...
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes.c: Refactor creation of notes commits.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Initial implementation handling trivial...
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
builtin/notes.c: Split notes ref DWIMmery into a separate...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes.c: Use two newlines (instead of one) when concatenatin...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
(trivial) t3303: Indent with tabs instead of spaces...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes.h/c: Propagate combine_notes_fn return value...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch 'mz/maint-rebase-X-fix' into maint
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbergk
Documentation/git-pull: clarify configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Yann Dirson
Document that rev-list --graph triggers parent rewriting.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Gabriel Corona
Fix username and password extraction from HTTP URLs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Gabriel Corona
t5550: test HTTP authentication and userinfo decoding
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
git instaweb: enable remote_heads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: group remote heads by remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: provide a routine to display (sub)sections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: refactor repository URL printing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: remotes view for a single remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: allow action specialization in page header
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: nagivation menu for tags, heads and remotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: separate heads and remotes lists
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: git_get_heads_list accepts an optional list...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: introduce remote_heads feature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Giuseppe Bilotta
gitweb: use fullname as hash_base in heads link
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
allow command-specific pagers in pager.<cmd>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
log.decorate: accept 0/1 bool values
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-16
Nguyễn Thái Ngọc Duy
clean: avoid quoting twice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-16
Jeff King
document sigchain api
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-16
Yann Dirson
Keep together options controlling the behaviour of...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
Clemens Buchacher
use persistent memory for rejected paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
verify-tag: document --verbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
branch: improve --verbose description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
archive: improve --verbose description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
Jonathan Nieder
Describe various forms of "be quiet" using OPT__QUIET
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
add OPT__FORCE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
add description parameter to OPT__QUIET
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
add description parameter to OPT__DRY_RUN
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
add description parameter to OPT__VERBOSE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
Clemens Buchacher
do not overwrite untracked during merge from unborn...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-14
Ævar Arnfjörð Bjarmason
tests: use test_cmp instead of piping to diff(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-14
Ævar Arnfjörð Bjarmason
t7004-tag.sh: re-arrange git tag comment for clarity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-13
Kirill Smelkov
setup: make sure git_dir path is in a permanent buffer...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-12
Antonio Ospite
git-send-email.perl: make initial In-Reply-To apply...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-11
Junio C Hamano
t3402: test "rebase -s<strategy> -X<opt>"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-11
Jonathan Nieder
Documentation: point to related commands from gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-11
Jonathan Nieder
Documentation: split gitignore page into sections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
Remove pack file handling dependency from wrapper.o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
pack-objects: mark file-local variable static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
wrapper: give zlib wrappers their own translation unit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
strbuf: move strbuf_branchname to sha1_name.c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
path helpers: move git_mkstemp* to wrapper.c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
wrapper: move odb_* to environment.c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
wrapper: move xmmap() to sha1_file.c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes.h/c: Allow combine_notes functions to remove...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes.c: Reorder functions in preparation for next...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes.h: Make default_notes_ref() available in notes API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
(trivial) notes.h: Minor documentation fixes to copy_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes.c: Hexify SHA1 in die() message from init_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Michael J Gruber
tag: recognize rfc1991 signatures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Michael J Gruber
tag: factor out sig detection for tag display
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Michael J Gruber
tag: factor out sig detection for body edits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Michael J Gruber
verify-tag: factor out signature detection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Michael J Gruber
t/t7004-tag: test handling of rfc1991 signatures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
rebase -X: do not clobber strategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
cherry-pick/revert: transparently refresh index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
apply: handle patches with funny filename and colon...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jeff King
docs: give more hints about how "add -e" works
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next