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
add tests for merge-index / merge-one-file
2011-04-29
Jeff King
add tests for merge-index / merge-one-
f
ile
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff Ki
n
g
diff: use
l
a
rge integers
f
or di
f
fst
a
t calcula
t
ions
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jeff Kin
g
docs: clarify "b
r
anch
-
l"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
dir: fix COLLEC
T
_IGN
O
RED on ex
c
lu
d
ed p
r
efixe
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-24
Jeff King
push: fix segfault for o
d
d config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-23
Jef
f
Kin
g
a
dd-interactive: fix bogus
dif
f
h
eader line ordering
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-19
Jeff King
rm: f
i
x bug
i
n recurs
i
ve subdirec
t
ory
r
emoval
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-18
Jeff K
i
ng
docs: don't t
a
lk abou
t
$
GIT_DIR/
r
e
f
s
/ everywhere
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-16
Jeff K
i
ng
dwim
_
ref:
fix
d
angl
i
ng symr
e
f warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
c
h
erry-
p
i
c
k:
prettif
y
the advice messag
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
c
herry-pick
:
show
c
ommit na
m
e in
s
te
a
d of sha1
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jef
f
Ki
n
g
cherry
-
pick: format hel
p
me
s
sage as
s
t
r
buf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff
King
c
h
erry-pic
k
: refactor
commit pars
i
n
g
c
ode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cherry-pick: rewrap advice message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
am: switch
-
-res
o
lved to --continue
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-07
Jeff King
a
c
cept "git
g
rep
--
p
a
ttern"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
Fix i
n
v
alid read in quote_c_style_counted
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
Jeff King
docs:
f
ix filter-b
r
anch e
x
ample fo
r
quoted paths
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-31
J
e
ff Ki
n
g
mention
n
e
w
shell execution behavior in
r
el
e
a
se
n
otes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff
K
ing
add shebang line to git-merget
o
ol--
l
ib
.
sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff
K
i
n
g
fix off-by-one allocation error
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
J
e
ff King
fix memcpy o
f
overlappi
n
g area
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff King
rej
e
ct @{-1} not
a
t beginning of object name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff King
fix parsi
n
g of @{-1}@{u} comb
i
na
t
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff
K
i
n
g
test com
b
ina
t
ions of @{} syntax
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff K
i
ng
rerere: f
i
x to
o
-short ini
t
ialization
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff King
t0101: use absolute date
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jef
f
King
commit: allow su
p
pr
e
ss
i
on
of imp
l
icit identity
advice
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
commit: show i
n
teresti
n
g
id
e
nt 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 King
strb
u
f: add strbuf
_
a
d
dbuf_percentquote
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
J
e
f
f
King
strbuf_expand: convert "%%"
t
o "%"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
d
i
ff: run
e
xternal diff hel
p
er with shell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
textconv: us
e
s
h
ell to run hel
p
er
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
e
d
itor:
u
se
run_command's
shell feature
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
run
-
command
:
optimize out
u
seless shell call
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
J
eff King
run-
c
o
m
mand: co
n
v
er
t
simple callsite
s
t
o
use
_
s
h
ell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-02
Jeff King
run-command: add "u
s
e shell" option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
J
e
ff
K
ing
te
x
tconv: sto
p
leaking f
i
le descri
p
t
o
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
res
e
t: unbreak hard rese
t
s with GIT_WORK_TREE
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore unkn
o
wn color configuration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-08
J
eff K
i
n
g
add
-
int
e
ractive: fix del
e
tion of non
-
em
p
ty files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff
King
tests: han
d
le N
O
_PYTH
O
N setting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
J
e
ff King
status
:
red
u
c
e dupli
c
ated setup
c
ode
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff King
status: disable colo
r
for porcelain
f
or
m
at
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
Jeff Kin
g
reset:
i
mpr
o
ve worktr
e
e safe
t
y v
a
lves
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff King
rerere: don
'
t seg
f
ault
o
n fa
i
l
ure to open
rr-cache
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-26
J
e
ff King
tes
t
s: rename
d
u
plicat
e
t1009
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
Jeff Kin
g
prune-
p
acked: onl
y
show pr
o
gress when stderr is a tty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff King
diff
c
o
r
e-bre
a
k: sa
v
e cnt_data for other
p
hases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff Kin
g
diffcore-break: free filespec
data as
w
e go
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
J
eff King
format-patch: m
a
ke "-
p
"
s
uppress diffs
t
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
push: fix
t
ypo
in
u
sage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
J
eff King
t
915{0,1}:
u
s
e $TEST_DIRE
C
TORY
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff
King
ls-files: unbreak "ls-files
-
i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff King
a
dd
-
int
e
ra
c
tive
:
h
andle deletion of empty
f
iles
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff
King
gitignore:
r
oot m
o
st patterns at
the top
-
lev
e
l di
r
ectory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
Jeff King
p
ush: alway
s
l
o
ad
defau
l
t config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-20
Je
f
f King
i
map-
s
end: remov
e
usel
e
ss
uid code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff
K
ing
c
v
simpo
r
t:
f
ix r
e
lative argumen
t
filena
m
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff King
do
c
ument p
u
sh's n
e
w quiet option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jeff K
i
ng
ls-
f
iles
:
exc
l
udes sho
u
ld n
o
t impact tracked
files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
Je
f
f King
pull: im
p
rove advice
for unconfigured error cas
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
Jeff
King
i
mprove reflog date/
n
umber h
e
uris
t
ic
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff King
re
b
a
s
e
: use plumbing to show d
i
r
ty state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Je
f
f King
s
t
a
tus
:
m
a
ke "how t
o
sta
g
e
"
m
essages op
t
i
o
nal
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
J
e
ff King
p
u
sh: make non-fa
s
t-forward help message configurable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
push: re-flow non-fa
s
t-for
w
ard message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
pus
h
: fix english in non-
f
ast-forward m
e
s
s
a
ge
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff
K
ing
do
c
s:
n
ote that st
a
t
u
s
configuration affec
t
s only long
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff Kin
g
com
m
it
:
support alternate status formats
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
sta
t
u
s: add --porcel
a
in output format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
e
ff King
status
:
refactor
f
ormat opti
o
n
parsing
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status:
refactor short-m
o
de
printing to it
s
own function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status
:
typ
o
fix
in usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff
K
ing
p
ush: teach --qu
i
et
to suppr
e
ss "Eve
r
ythi
n
g up-to-da
t
e
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Jeff K
i
ng
clone: disconnect t
r
ansport after f
e
tching
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff K
i
n
g
fix approxidate p
a
rs
i
ng
o
f rela
t
iv
e
m
o
nths
and yea
r
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff King
tests
:
add
date printing and p
a
rsing tests
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff Kin
g
refactor test-da
t
e interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
Jeff King
cl
o
ne: add
-
-branch option to
s
elec
t
a
diff
e
r
e
n
t
HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Jeff King
checkout: do
n
o
t
i
mp
l
y "-f" on
u
nborn branch
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
J
e
ff King
tes
t
s: disable intera
c
tive
h
un
k
select
i
on tests if
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
Jeff King
docs:
describe impact of repack on "clone -s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Jeff King
all
o
w pull --rebase
o
n
bra
n
c
h yet to
b
e born
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
me
r
ge: indicate re
m
ote tracking branches
i
n
merge message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
J
eff King
merge: f
i
x
i
ncorrect merge mes
s
ag
e
for amb
i
g
uous tag
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jef
f
King
add tests for me
r
ge messag
e
headi
n
g
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff K
i
ng
t/Makefile
:
i
nclude config
.
mak
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Je
f
f
K
i
ng
tests:
allow user
t
o specify tras
h
di
r
e
c
t
ory location
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
test
s
: provide
$TRASH_DIREC
T
ORY variable
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
tests: use
"$TEST_DIRECTO
R
Y" ins
t
ead of "
.
.
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-07
J
e
ff King
Makefile:
git-http-
f
etch does not need exp
a
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
J
e
ff King
t
r
a
nspor
t
: don't show push s
t
a
t
us
i
f
--quiet
i
s given
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
t
ra
n
s
p
ort: pass "quiet" flag to pack-obj
e
cts
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-06
Jeff King
push
:
add --qui
e
t flag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-24
Jeff King
send
-
em
a
il: detect cycles in a
l
ias expansion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff K
i
ng
show: add space
bet
w
een
mul
t
iple items
Tagger:
Jeff King
<peff@peff.net>
Author:
Jeff King
<peff@peff.net>
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-19
Jeff King
show: suppress extr
a
newline
w
h
en showi
n
g annotated
tag
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-09
Jeff King
M
akefile: install 'git' in
execdir
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-07-01
J
eff Ki
n
g
log
-
tree: fix
c
onfusing comment
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next