repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-1.7.0' into maint
2010-05-10
J
e
f
f King
handle "git --bare init
<
d
ir>" properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff Ki
n
g
r
ebase-interactive
:
silen
c
e warning whe
n
no c
o
mmits
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Je
f
f
King
diff: u
s
e large i
n
t
e
g
ers
for
diffs
t
at calculat
i
ons
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jeff King
docs: clar
i
f
y
"branch -l"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
J
e
ff King
fix t
y
pos and gr
a
mma
r
in 1
.
7
.
1 draft rel
e
as
e
notes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
ff Kin
g
f
ix text
c
onv leak i
n
e
m
it_rewrit
e
_diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
fix const-cor
r
ectness of wri
t
e
_sha1_fi
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-14
J
e
ff King
dir
:
f
i
x COLLECT_I
G
NORED on
excluded pr
e
fixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-03
J
e
ff King
s
u
bmod
u
le summa
r
y: do n
o
t sh
i
f
t
a
non-existent pos
i
t
i
onal
.
.
.
commit
|
commitdiff
|
tree
2010-02-24
Jeff Ki
n
g
pu
s
h: fix
segf
a
ult for odd confi
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-23
Jeff King
add
-
in
t
e
r
acti
v
e: fix bogus di
f
f header line ordering
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-19
Jeff King
r
m: fix
b
u
g
i
n re
c
ursiv
e
s
u
b
direc
t
or
y
r
emov
a
l
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-18
Jef
f
King
d
o
cs: d
o
n
'
t talk about $GIT_DIR/refs/ everywhere
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-16
J
eff King
dwim_ref: fix dangling symref warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
che
r
ry-pic
k
: prettify the advice me
s
s
age
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
J
eff King
cherry-
p
ic
k
: show commit
name i
n
stead of sh
a
1
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
ch
e
rry-p
i
ck: f
o
rmat help me
s
sa
g
e
as strbuf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cherry-p
i
ck: refactor c
o
mmit par
s
ing code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cherry-pick:
r
ewrap advice mess
a
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
a
m: swit
c
h -
-
re
s
o
l
ve
d
t
o
--
c
onti
n
ue
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-07
Jeff King
accept "git
g
rep --
p
attern"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
J
e
ff King
Fix in
v
a
l
id
r
ead in qu
o
te_c_s
t
yl
e
_coun
t
ed
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
docs: f
i
x filter-branch exa
m
ple fo
r
quoted
paths
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
mention
n
e
w sh
e
l
l execution
b
ehavior in release n
o
tes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Je
f
f King
add shebang line to gi
t
-mergetool--lib
.
sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Je
f
f King
f
ix
o
ff-by-on
e
alloc
a
t
i
o
n err
o
r
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
fix
m
e
mcpy of overlap
p
ing area
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
J
e
ff King
re
j
ect @{-1} not at
beginning of object name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff Ki
n
g
fix p
a
rs
i
n
g
of
@
{-1}
@
{u} combinatio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff King
t
e
st
c
o
m
binati
o
n
s
of @{} sy
n
ta
x
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff
K
ing
rerere: fix
too-s
h
ort
initialization
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff
Ki
n
g
t0101: u
s
e absolut
e
date
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
commit: allow suppression o
f
implicit ide
n
t
ity advice
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Je
f
f Ki
n
g
commit
:
show int
e
r
esting ident information in summary
Committer:
Jeff King
<peff@c-71-185-130-222.hsd1.va...
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff
K
ing
strbu
f
: add s
t
rb
u
f
_
add
b
uf_perc
e
ntquote
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
strbuf_expand: c
o
nvert "%%" to "%"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
J
eff King
diff:
run
e
xt
e
r
n
a
l
diff helper with shell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
te
x
t
c
o
n
v: use
s
hell to run
helper
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
J
eff
K
in
g
ed
i
tor: use run_command's shell featur
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
ru
n
-command: o
p
t
imize o
u
t useless shell calls
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
r
u
n-comman
d
: convert s
i
mple callsites to use
_
shell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-02
Jeff
K
ing
run
-
comm
a
nd: add "use she
l
l" option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
textconv
:
stop leaking file descriptors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
r
e
set:
u
nbreak hard resets wit
h
GIT
_
WOR
K
_TREE
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-16
Je
f
f King
ignore
unkno
w
n color co
n
figuration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
a
d
d
-interacti
v
e
: fix de
l
eti
o
n of n
o
n-empty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff King
tests: handle NO_PYTHON setting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jef
f
King
s
t
a
tus
:
reduce duplicated setu
p
co
d
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff
K
ing
sta
t
us: d
i
sable color for
porcelain forma
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
re
s
et: improve worktree safety va
l
v
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rer
e
re: don't segfault on failure t
o
open rr-cache
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-26
Jeff King
tests: rename
duplicate t1009
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
Jeff
King
p
r
u
ne
-
p
acked: only show progress
w
h
e
n stderr is a tty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff
King
diff
c
or
e
-break
:
save cnt_data
f
or o
t
her ph
a
ses
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diffcore-b
r
e
a
k
: free filespec data as we
g
o
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
J
e
f
f
K
ing
f
orma
t
-pat
c
h: make "-p" suppress
d
i
f
fstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
push:
f
ix typo
i
n usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
t915{0,1}: us
e
$TEST_DIRE
C
TORY
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff K
i
ng
l
s
-fil
e
s: unbreak "ls-file
s
-i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
add-
i
nteractive: handle deletion of e
m
pty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
gi
t
ignore: root most
p
atter
n
s
a
t
th
e
top-lev
e
l director
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
Jeff
K
ing
push: always lo
a
d
de
f
a
ult config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-20
Jeff King
i
map-send:
re
m
o
ve useless u
i
d
code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
c
vs
i
mport: fix
r
e
lative argument
fil
e
nam
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
document
pu
s
h's
new quiet opti
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Je
f
f King
ls-files: ex
c
ludes sh
o
u
ld
n
ot impac
t
tracked f
i
les
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
Jeff King
pull: improve adv
i
c
e for unconfigured
error
c
ase
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
Jeff King
improve
r
e
f
l
o
g date/number heuristic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
rebase: use plumbing to show d
i
rty state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff
K
ing
s
tat
u
s: mak
e
"how
to
s
t
age
"
message
s
opti
o
nal
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
p
u
sh
:
m
a
ke
n
on-fast-f
o
rwa
r
d h
e
lp m
e
ssage configurabl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
e
f
f
K
in
g
pus
h
: re-flow non
-
f
a
s
t-forward messa
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
push: fix
e
nglish in non-fast-forwar
d
mess
a
g
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff
King
do
c
s: no
t
e
that status configuration
a
f
f
ec
t
s only long
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
e
f
f K
i
ng
commit: s
u
pport alternate status fo
r
mats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status: add --porce
l
a
in o
u
tpu
t
fo
r
mat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jef
f
King
status: refactor for
m
at
option
parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status: refactor short
-
m
ode printing to its
o
wn function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
e
ff King
s
tatus: ty
p
o fix in us
a
ge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff Kin
g
p
u
s
h
: t
e
ach
-
-qui
e
t t
o
su
p
press
"Eve
r
y
t
hing up-to-date"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jef
f
King
clone
:
dis
c
on
n
ect
t
ran
s
p
ort after
fetching
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
f
i
x approxidate
p
a
rsing of r
e
lative month
s
and ye
a
rs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
J
eff King
tests: add date
p
rint
i
ng and par
s
in
g
tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
refact
o
r test-date
int
e
rface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
clo
n
e:
add --bran
c
h option to select a differen
t
HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Jeff K
i
ng
checkout: do not imply "-f" on unborn br
a
nc
h
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff King
tests: di
s
able intera
c
ti
v
e h
u
nk selection tests
i
f
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
J
e
ff King
docs:
d
escribe imp
a
ct of repac
k
on "c
l
one -s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Je
f
f King
allow pull --re
b
ase on branch yet t
o
be
born
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jef
f
King
merge: in
d
icate remote
t
rac
k
ing br
a
nches in merge me
s
sage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge: f
i
x i
n
corr
e
ct merge mes
s
ag
e
for ambiguous
t
a
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
add tests for merge messa
g
e hea
d
i
ngs
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
t/Ma
k
efile: incl
u
d
e config
.
mak
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
J
eff King
tests: allow use
r
to speci
f
y tr
a
sh directory location
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
tests: provide $T
R
ASH
_
DIRECTORY variab
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
tests: use "$TEST_DIRECTORY" instead
o
f "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
Jeff Kin
g
Makefile
:
git-
h
ttp-fetch does n
o
t
ne
e
d
exp
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
J
e
f
f
King
transpor
t
: d
o
n
't sh
o
w push status if -
-
quiet
is
g
iven
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
transport: pass "quiet" flag to pack-obj
e
cts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jef
f
K
ing
push: add --qu
i
et f
l
ag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next