repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rr/doc-content-type' into maint
2011-05-26
Je
f
f King
read_g
i
tfile_gently: use ssiz
e
_t to hold read r
e
sult
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gi
t
p
r
oxy configurat
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
sen
d
-pack: avoid deadlock on git:// push with fail
e
d
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect: let ca
l
lers kn
o
w
if con
n
ect
i
on is a sock
e
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
con
n
ect
:
t
re
a
t gener
i
c proxy processes
like ssh processes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f
King
t3503: t
e
st cherry picking and revert
i
ng ro
o
t commits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
revert:
a
llow
r
everting
a r
o
ot
c
ommi
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
cherry-pick: handl
e
root commit
s
with external str
a
tegies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
J
e
ff King
s
e
nd-pac
k
: unbreak push over stat
e
le
s
s rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-f
i
le: fi
x
b
r
oken merges with alternate work
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
ad
d
tests
f
or mer
g
e-index / merge-one-file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: quote rfc822 spe
c
ia
l
s i
n
emai
l
addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Ki
n
g
up
l
o
ad-pack: start pac
k
-o
b
jects
bef
o
re async rev-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Kin
g
stash: drop dirty worktree c
h
ec
k
on a
p
ply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Ki
n
g
s
t
ash:
fix accidental apply of
n
on-
e
x
i
stent stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Jeff King
pull: do
not
c
lobber u
n
tracked files on init
i
al pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
J
e
ff King
docs: fix filter-branch s
u
bdir example for exotic
r
e
po
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
remote
:
de
p
recate --mirro
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f King
rem
o
te: separat
e
the
c
onc
e
p
t
of push and fetch mi
r
rors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
J
e
f
f
King
remo
t
e
:
disa
l
low some nonse
n
s
ic
a
l o
p
tion combinati
o
ns
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
tests: kill ba
c
kgrounded processes more rob
u
stly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pul
l
: do
not clobber
u
ntr
a
c
ked
f
i
l
es on initial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Je
f
f King
merge: merge unborn index before setting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
ff King
t7607: clean
u
p stray untracked f
i
le
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
t
7607: mark known breakage in te
s
t 11 as fi
x
ed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-21
Jeff King
bisect
:
visual
i
ze with git-log if gi
t
k
is unavailabl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
eff King
checkout
:
tw
e
ak deta
c
hed-orph
a
n w
a
rning form
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
J
eff King
c
h
eckout: clear commit
marks after
detache
d
-
orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff
K
ing
checkout:
add bas
i
c tests f
o
r
d
e
ta
c
hed-or
p
han warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
Jeff King
docs:
p
oint git
.
txt a
u
thor credits to git-scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff Ki
n
g
doc: add mis
s
ing g
i
t
f
ooters
commit
|
commitdiff
|
tree
2011-03-11
J
e
ff King
d
o
c
: drop author/
d
ocum
e
n
tation
secti
o
n
s from most p
a
ge
s
commit
|
commitdiff
|
tree
2011-03-08
J
e
ff Kin
g
t
r
ace: g
i
ve repo_setup tr
a
ce its
o
wn key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
add
p
acket tracing debug co
d
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace
:
add
t
ra
c
e_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: factor out "do we want to tra
c
e
" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
tra
c
e: r
e
f
a
ctor to
support
multiple env
v
ariables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
t
race: ad
d
trace_vprintf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Je
f
f K
i
n
g
strbuf:
a
dd strbuf_va
d
df
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
Jeff King
compat:
p
rovide
a
fallback va_copy defin
i
tion
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 K
i
n
g
forma
t
-p
a
tch: wrap long header lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jeff
K
i
ng
strbuf: a
d
d
f
i
xed-length version of
add_wrap
p
ed
_
text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff King
diff:
don't retrieve binary
blobs
f
or diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
J
ef
f
Ki
n
g
diff
:
handle diffstat of rewritt
e
n binary files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
ff King
pull:
p
r
opagate --progress to m
e
rge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
King
me
r
ge:
e
nab
l
e progress reporti
n
g for rename detection
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Je
f
f King
a
d
d inex
a
c
t
rename detection progress i
n
f
r
astructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
commi
t
: stop settin
g
r
e
n
ame lim
i
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
bump rena
m
e limit defaul
t
s (again)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff Kin
g
m
erge: improve i
n
ex
a
ct rename limit
warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
J
eff King
clone: die w
h
en trying t
o
clon
e
missi
n
g
l
ocal path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
J
e
ff King
string_list
_
a
ppend:
a
lways s
e
t util p
o
inter to NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
test
s
: sanitize more git en
v
ir
o
nment
variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff
K
ing
rebase
:
give
a
better
e
rror
mess
a
ge for bogus
b
ranch
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: u
s
e
e
xplicit
"
-
-
" with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jeff King
docs
:
explain diff
.
*
.
binary
o
p
tion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
id
e
n
t
: die on bo
g
u
s date f
o
rmat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
f
f King
t
2107: mark pa
s
sing test as succe
s
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
Jeff
King
handle
arbitrary
i
nts in git_config_maybe_b
o
ol
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff King
tests: flip executabl
e
bit on t9158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Je
f
f Ki
n
g
tests:
a
dd
some script lin
t
checks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff King
default
c
olor
.
status
.
branch to "s
a
me as
h
eade
r
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff K
i
n
g
d
o
cs: default to more modern toolset
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
r
e
flogs: clear flags properly in
c
orner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff
King
a
llow c
o
mm
a
nd-specific pagers in pager
.
<
c
md>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
J
eff King
lo
g
.
d
e
corate: accept 0/1 bo
o
l 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
J
e
ff
K
ing
docs
:
give more hints about how "
a
dd -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
Jeff King
d
o
cs: cla
r
ify git diff m
o
des of operation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jeff
K
ing
a
pply: don't s
e
gfaul
t
on binary files with missing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff
Kin
g
diff: report b
o
gu
s
i
n
put
t
o -C/-M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff Kin
g
conf
i
g: treat non-existent c
o
nfi
g
files as empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Jeff King
d
o
c
s: give more hints about how "ad
d
-e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jef
f
Kin
g
push: pass --prog
r
e
ss down to
gi
t
-
pack-objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
J
e
ff King
te
s
t
s: test terminal
o
utput
to bo
t
h stdout and stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jef
f
King
t
es
t
s: factor o
u
t
t
erminal hand
l
ing from t7006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff King
rev-list: ha
n
d
l
e %x00 NUL in
user forma
t
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
J
e
ff King
diff: don'
t
u
se pathname-
b
ase
d
dif
f
dri
v
ers for sy
m
links
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff
K
i
n
g
tests: make test_
m
ust_fail fail on miss
i
ng commands
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jef
f
K
i
ng
tests: make test_must_fail more verbose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
J
e
ff King
pass
"
git -c foo=ba
r
"
p
arams through environment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff
King
docs: fi
x
M
a
ke
f
ile dependenc
y
for user ma
n
u
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
J
e
ff
K
ing
t
est-date: fix sscanf type conversion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
parse_date: fix sig
n
e
d
n
ess in timezone
c
a
lculation
author
Jeff King
<peff@peff.net> 1275404416 +119304128
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Jeff King
t000
6
: te
s
t
timezone pa
r
sing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
J
eff King
notes: check n
u
mber
of par
a
meters
t
o "git note
s
copy
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jef
f
K
ing
Ma
k
efile: de
f
a
ult pager on AIX
to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Je
f
f King
c
omm
i
t: giv
e
advice
o
n emp
t
y amend
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff King
Makefile: defaul
t
pa
g
er on AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
pull: do nothin
g
on --dry-run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff K
i
n
g
remove over-e
a
ger cachi
n
g in sha1_file_name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff King
decode file:/
/
and ssh:// U
R
Ls
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-24
Jeff King
m
ake url
-
related functions reusable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-19
Je
f
f King
do
c
s: c
l
arify mea
n
ing of -M fo
r
git
-
log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
tests: chmod +x t5150
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Je
f
f
K
ing
tests:
rename
d
uplicate t4205
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jef
f
King
h
a
n
dle "git --ba
r
e
init <dir>"
properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff King
r
e
base-interactiv
e
:
silence warning wh
e
n no commit
s
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next