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 'maint'
2011-05-20
Jeff King
Makefile: sort TEST_PROGRAMS list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core.gitproxy configuration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-pack: avoid deadlock on git:// push with failed...
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect: let callers know if connection is a socket
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect: treat generic proxy processes like ssh processes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503: test cherry picking and reverting root commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert: allow reverting a root commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pick: handle root commits with external strategies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-10
Jeff King
t7501.8: feed a meaningful command
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send-pack: unbreak push over stateless rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file: fix broken merges with alternate work...
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for merge-index / merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: quote rfc822 specials in email addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-14
Jeff King
format-patch: wrap email addresses after long names
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-pack: start pack-objects before async rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: drop dirty worktree check on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: fix accidental apply of non-existent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
pull: do not clobber untracked files on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff King
docs: fix filter-branch subdir example for exotic repo...
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote: deprecate --mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote: separate the concept of push and fetch mirrors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote: disallow some nonsensical option combinations
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
tests: kill backgrounded processes more robustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision.c: make --no-notes reset --notes list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision.c: support --notes command-line option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
notes: refactor display notes default handling
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
notes: refactor display notes extra refs field
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
revision.c: refactor notes ref expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-29
Jeff King
notes: make expand_notes_ref globally accessible
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull: do not clobber untracked files on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
merge: merge unborn index before setting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: clean up stray untracked file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t7607: mark known breakage in test 11 as fixed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
bisect: visualize with git-log if gitk is unavailable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: tweak detached-orphan warning format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: clear commit marks after detached-orphan...
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
checkout: add basic tests for detached-orphan warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
docs: point git.txt author credits to git-scm.com
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: add missing git footers
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: drop author/documentation sections from most pages
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: give repo_setup trace its own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
add packet tracing debug code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: add trace_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: factor out "do we want to trace" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: refactor to support multiple env variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: add trace_vprintf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
strbuf: add strbuf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
compat: provide a fallback va_copy definition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff King
format-patch: rfc2047-encode newlines in headers
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
format-patch: wrap long header lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff King
strbuf: add fixed-length version of add_wrapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: don't retrieve binary blobs for diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff: handle diffstat of rewritten binary files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: propagate --progress to merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge: enable progress reporting for rename detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
add inexact rename detection progress infrastructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
commit: stop setting rename limit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
bump rename limit defaults (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge: improve inexact rename limit warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff King
clone: die when trying to clone missing local path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff King
string_list_append: always set util pointer to NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
tests: sanitize more git environment variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give a better error message for bogus branch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: use explicit "--" with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
docs: explain diff.*.binary option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
ident: die on bogus date format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
t2107: mark passing test as success
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff King
handle arbitrary ints in git_config_maybe_bool
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff King
tests: flip executable bit on t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff King
tests: add some script lint checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff King
default color.status.branch to "same as header"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
docs: default to more modern toolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
reflogs: clear flags properly in corner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
allow command-specific pagers in pager.<cmd>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
log.decorate: accept 0/1 bool values
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
Jeff King
document sigchain api
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Jeff King
docs: give more hints about how "add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff King
docs: clarify git diff modes of operation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff King
apply: don't segfault on binary files with missing...
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
diff: report bogus input to -C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
config: treat non-existent config files as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
docs: give more hints about how "add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
push: pass --progress down to git-pack-objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests: test terminal output to both stdout and stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff King
tests: factor out terminal handling from t7006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff King
rev-list: handle %x00 NUL in user format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Jeff King
prefer test -h over test -L in shell scripts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
Jeff King
diff: don't use pathname-based diff drivers for symlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
tests: make test_must_fail fail on missing commands
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
tests: make test_must_fail more verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff King
pass "git -c foo=bar" params through environment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff King
docs: fix Makefile dependency for user manual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
Jeff King
test-date: fix sscanf type conversion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
parse_date: fix signedness in timezone calculation
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
t0006: test timezone parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
Jeff King
notes: check number of parameters to "git notes copy"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
Makefile: default pager on AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
commit: give advice on empty amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff King
Makefile: default pager on AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
pull: do nothing on --dry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next