repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Split was_tracked() out of would_lose_untracked()
2011-05-27
Jef
f
K
i
ng
docs: fix some antique exam
p
le output
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
K
in
g
doc
s
: make sure liter
a
l "
-
>
"
isn't co
n
verted
to arrow
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs
:
u
p
d
ate status -
-
po
r
c
e
lain
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
docs: mino
r
g
r
a
mmar fixe
s
to git-sta
t
us
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-26
J
e
f
f King
read
_
g
i
tfile_gently:
u
s
e ss
i
z
e_t to hold r
e
a
d result
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jef
f
King
confi
g
: alway
s
parse GIT_CONFIG_PAR
A
METERS
d
u
r
i
n
g git_config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_config: don't pe
e
k a
t
gl
o
bal config
_
parameters
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-24
Jeff K
i
ng
config
:
make
e
nvir
o
nment parsin
g
r
out
i
nes s
t
a
tic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-18
J
e
ff K
i
ng
test c
o
re
.
git
p
ro
x
y
configura
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send
-
pack: avoid dead
l
ock
o
n git://
push with failed
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
K
in
g
con
n
ect: let ca
l
lers know if connection i
s
a so
c
ke
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect
:
t
r
eat generic proxy processes like ssh processe
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f King
t350
3
: t
e
st
c
herry
p
i
cking an
d
reverting root com
m
its
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
re
v
ert
:
al
l
ow revert
i
ng a roo
t
commit
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
herry-pick
:
handle
r
oot commi
t
s with external strate
g
ies
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-05-05
J
e
ff King
send-pack
:
unbreak push over sta
t
ele
s
s
rpc
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-
f
ile:
f
ix 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
pre
t
ty: quote rfc8
2
2 special
s
i
n email
addresses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff
Ki
n
g
upl
o
ad
-
p
ack: start pack
-
obj
e
c
ts
be
f
ore a
s
ync re
v
-list
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
st
a
sh: d
r
op dirty worktree check on apply
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff
K
ing
s
t
ash
:
fix
a
ccidental app
l
y of non-
e
xiste
n
t stashes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-03
Je
f
f King
pull: d
o
not clobber untracked files
on initi
a
l pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-04-01
Jeff Kin
g
docs
:
fix fil
t
er-branch s
u
bdir example f
o
r exoti
c
repo
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Je
f
f King
r
e
mote: deprec
a
te --mirror
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
r
e
mote: separate the
concept
of push and fetch mirr
o
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jef
f
K
i
ng
remo
t
e: disall
o
w so
m
e nonsensical opt
i
on co
m
binat
i
o
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-30
Jeff King
test
s
:
kill ba
c
kgrounded processes more robustly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff King
pull: do not clo
b
ber untracked files on i
n
itial pull
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
ff King
m
erge: merge unborn i
n
dex befor
e
s
e
tting ref
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
J
e
f
f
K
ing
t
7
607:
clean up stray untrac
k
ed file
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-25
Jeff Ki
n
g
t7
6
07:
m
ark 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-l
o
g if g
i
tk is unavailabl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
c
h
eckout: tweak det
a
ched-or
p
ha
n
w
arning for
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff Ki
n
g
ch
e
ckout: clear commit m
a
rks after det
a
ched-orphan
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-20
Jeff King
che
c
kout: add basic
t
ests for det
a
ched-orphan warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-13
J
eff Kin
g
do
c
s:
point git
.
t
x
t auth
o
r credits to g
i
t-scm
.
com
commit
|
commitdiff
|
tree
2011-03-11
Jeff King
doc: add mi
s
s
ing gi
t
fo
o
t
e
r
s
commit
|
commitdiff
|
tree
2011-03-11
Jeff K
i
ng
d
o
c:
d
rop a
u
t
h
o
r
/docu
m
entation sect
i
on
s
f
rom
m
ost
pages
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: give repo_
s
et
u
p tra
c
e
i
ts own key
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
Kin
g
add pa
c
ket tracing debu
g
code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
e
f
f K
i
n
g
tra
c
e: add t
r
a
c
e_strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jef
f
K
ing
t
r
ace
:
f
a
ct
o
r
out "do we want
to trace" logic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
J
eff King
trace: r
e
factor to
s
u
ppor
t
mult
i
ple env
variables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-03-08
Jeff King
trace: ad
d
trace_vp
r
intf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
J
eff King
s
trbuf: ad
d
s
t
rbuf_vaddf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-26
J
eff King
compat: pr
o
v
i
de a fallback va_c
o
py defi
n
ition
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-24
Jeff Kin
g
fo
r
m
a
t-patch: rfc
2
047-e
n
code newlines in head
e
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Jef
f
King
format-
p
atch: wrap long header lines
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-23
Je
f
f K
i
ng
s
t
rb
u
f: add fi
x
e
d
-
l
ength
version of ad
d
_
w
rapped_text
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff
Ki
n
g
diff: d
o
n't retrieve binary blob
s
for diffsta
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-22
Jeff
King
diff: hand
l
e diff
s
tat of
r
ewrit
t
e
n
binary file
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
pull: propagate
--progress t
o
merge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
merge
:
enab
l
e progress
report
i
ng for rename de
t
ecti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff King
ad
d
i
n
exac
t
re
n
ame detection progre
s
s
i
nfras
t
ructure
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jeff
K
i
ng
commit: stop setting renam
e
li
m
i
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
Jef
f
King
bump re
n
ame l
i
mit de
f
aults (aga
i
n)
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-21
J
e
f
f
K
ing
merge:
i
mpr
o
ve inexact renam
e
limit warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-18
Jeff King
cl
o
ne: die when trying to clone missing
l
ocal path
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-02-14
Jeff K
i
ng
st
r
ing_list_append: always
s
e
t u
t
il pointer to NULL
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
tests: s
a
n
itize more
g
it environment var
i
ables
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
Jeff King
rebase: give a better e
r
ror mess
a
ge for bogus branc
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-27
J
e
ff Kin
g
r
e
base:
u
se ex
p
licit "--"
with checkout
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2011-01-10
Jef
f
King
docs: e
x
p
l
ain d
i
ff
.
*
.
binary option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-20
Jeff King
ident:
die on bogus date form
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
ff King
t2107: mark pass
i
n
g
test as succe
s
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-19
J
e
ff King
handle arbitrary int
s
in git_config_maybe
_
bo
o
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff K
i
ng
tests
:
fl
i
p executable b
i
t o
n
t
9
158
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-13
Jeff Ki
n
g
tests: add some script lint che
c
k
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-12-10
Jeff King
default color
.
status
.
branch
to "same as hea
d
er"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff King
d
ocs: default to more modern t
o
o
l
s
et
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-24
Jeff
King
ref
l
ogs: clear flag
s
pr
o
perly in corner case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Jeff King
allow
c
o
m
mand-specific
p
agers in
p
a
ger
.
<cmd>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-17
Je
f
f King
log
.
deco
r
ate: accept 0/1 bool
v
al
u
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-16
J
eff King
document sigchain a
p
i
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-10
Jeff Kin
g
docs: g
i
ve more hints a
b
ou
t
how "add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-11-05
J
eff K
i
ng
docs: cl
a
rify git diff modes of ope
r
ation
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-29
Jef
f
King
a
p
ply: don'
t
segfau
l
t on b
i
nary files with missing
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Je
f
f King
d
i
ff
:
report bogus
i
nput
t
o -C/
-
M/-B
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
Je
f
f King
c
o
nfig
:
tr
e
at non-existe
n
t config files a
s
empty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-21
J
eff Ki
n
g
docs:
give more hints about
how
"
add -e" works
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jef
f
King
push: pass --prog
r
ess down
t
o git
-
pack-obje
c
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
Jeff Ki
n
g
tests: t
e
st termina
l
output to b
o
th
s
tdout and stderr
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-18
J
eff K
i
ng
tes
t
s
:
fac
t
or out
te
r
minal hand
l
i
n
g from t7006
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-10-14
Jeff King
r
e
v-
l
i
st: handle
%x00 NUL
i
n
user format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-27
Je
f
f King
p
r
efer test -h over test
-
L in s
h
ell scri
p
ts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-09-24
J
eff King
diff: don't us
e
p
a
thname
-
based diff drivers for symlinks
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff
K
ing
tests
:
make tes
t
_must
_
f
ail fai
l
on missing
c
ommands
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
tests: make test_must_fail more ve
r
b
ose
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-24
Jeff King
p
a
ss
"git
-c foo=bar"
pa
r
ams th
r
o
u
gh environmen
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-08-22
Jeff Kin
g
d
o
cs: fix Makefile depe
n
denc
y
for
u
ser manual
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-06
J
eff King
test-date: fix sscanf t
y
pe co
n
ve
r
sion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-07-05
Je
f
f King
parse_da
t
e: f
i
x signed
n
e
s
s in tim
e
z
o
ne calculat
i
on
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:
t
est timezone parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-28
J
e
ff King
notes:
check numbe
r
o
f
par
a
meters to "git notes c
o
py"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
Makefil
e
: d
e
fault pager on AIX to "more
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-11
Jeff King
commi
t
: give advice on empty ame
n
d
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-06-10
Jeff
K
ing
Makefile: defa
u
lt pager on AIX to "more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff
K
i
ng
pull
:
d
o
nothing
on --dry
-
run
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-25
Jeff King
remove over-eager caching
in sha1_file_nam
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next