repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: demonstrate an incorrect conflict with submodule
2010-06-10
Jeff
K
in
g
Makefile: defaul
t
pager on
A
IX t
o
"more"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff K
i
ng
tests: chmod +x t51
5
0
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
Jeff King
te
s
t
s
: r
e
na
m
e
duplicate t4205
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-05-10
J
ef
f
King
handle "g
i
t
--bare init <dir>" properly
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-18
Jeff
K
ing
reba
s
e-inter
a
ctive
:
silence warning wh
e
n no commits
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-17
Jeff King
diff
:
use l
a
rge integers for
d
iffstat calculatio
n
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-09
J
e
f
f King
script with rev-
l
i
st inste
a
d
of log
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-08
Jef
f
King
docs: cla
r
ify "branch
-
l
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-07
Jeff
King
fix typos and grammar in 1
.
7
.
1
d
raft r
e
lease
notes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff
King
diff: a
v
o
i
d useless filespec po
p
u
latio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
eff
King
diff: cach
e
textconv out
p
ut
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
t
ext
c
onv
:
refactor calls t
o
run_textc
o
nv
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
introduce note
s
-
cache inte
r
f
a
ce
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
ff
K
ing
make commit_tree
a
library function
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
J
e
ff
King
f
ix textconv l
e
ak in emit_rewrite_diff
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-04-02
Jeff King
fix cons
t
-correctne
s
s
o
f w
r
ite_s
h
a1_fi
l
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-14
Jeff Ki
n
g
d
ir: fix CO
L
L
ECT_IGNORED on ex
c
lude
d
p
refixes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-03-03
Je
f
f King
submodule su
m
ma
r
y: do not
s
h
ift a
n
o
n-existent p
o
sitional
.
.
.
commit
|
commitdiff
|
tree
2010-02-24
Jeff King
push: fi
x
segfault fo
r
odd config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-23
Jeff King
add-interactive: fix
b
ogus d
i
ff header line
o
r
dering
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-19
Jeff
K
ing
r
m: fix bug
i
n recursive subdirect
o
ry rem
o
val
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-18
J
e
f
f King
docs: don't talk
a
bout $G
I
T_DIR/refs/
e
verywhere
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-16
J
eff King
dw
i
m_r
e
f: fix dangling s
y
m
ref warning
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cherry-pick: pre
t
tify the advic
e
message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff
K
i
ng
cherry-pic
k
:
show commit name instead of sha1
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff King
cher
r
y-pick
:
f
o
rmat
he
l
p
m
essage
as st
r
buf
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
J
eff King
ch
e
rry-pick:
re
f
ac
t
o
r
commit parsing cod
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff
K
i
ng
cherry
-
pick: rewra
p
advice message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-12
Jeff Kin
g
am: swi
t
ch --resolved to --contin
u
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-07
Jeff King
a
c
c
ept "git grep --
p
atte
r
n"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
Jeff Kin
g
Fix invalid r
e
ad
i
n quote_c_sty
l
e
_
counted
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-02-06
Jeff
King
d
ocs: fix filt
e
r-branch exa
m
ple for quoted paths
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-31
Jeff King
men
t
ion new shel
l
execu
t
ion behavior in
r
e
lease n
o
tes
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
add shebang line t
o
gi
t
-mergetool--li
b
.
s
h
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
Jeff King
f
ix off-by-
o
ne allocation error
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-29
J
e
f
f Kin
g
fix memcpy of overlappi
n
g
are
a
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff
King
reject @{-1} no
t
a
t beg
i
nning of object name
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
J
eff King
fix
p
arsi
n
g of @{-1}@
{
u} combina
t
ion
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
J
e
f
f King
test combinations o
f
@
{
} syntax
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jef
f
K
i
ng
rer
e
re: fix too
-
s
hort initializati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-28
Jeff King
t0101: use absolut
e
date
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
co
m
mit: allo
w
suppression of imp
l
icit ide
n
tit
y
a
d
vi
c
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
commit: sho
w
interesti
n
g
i
d
e
nt informat
i
on in summ
a
ry
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 Ki
n
g
strbuf:
a
dd strbuf_addbuf_pe
r
centquote
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-14
Jeff Kin
g
strbuf_expand: conver
t
"%%" to "%"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff K
i
ng
diff: run e
x
te
r
n
al di
f
f he
l
per
with
shell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff King
te
x
tconv: use sh
e
ll
to ru
n
h
e
l
p
er
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
Jeff
King
editor: use run_com
m
and's
shell
f
e
ature
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
J
e
f
f
Ki
n
g
run-c
o
mm
a
nd: opt
i
mi
z
e
out useless shell cal
l
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-06
J
eff
King
run-comm
a
nd: conver
t
s
imp
l
e
c
allsites
t
o use
_
s
hell
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2010-01-02
J
e
ff
King
run-comm
a
nd
:
add
"
us
e
shell" option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
J
e
ff King
tex
t
conv:
s
top leaki
n
g fi
l
e desc
r
iptors
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-30
Jeff King
res
e
t: unbreak
h
ard resets with
GIT_WORK_TREE
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-16
Jeff King
ignore
u
nknown col
o
r c
o
nfiguration
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-08
Jeff King
add-i
n
t
e
r
a
ctive:
fi
x
deleti
o
n
of
n
on-empt
y
files
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Jeff Ki
n
g
tests: handle NO_PYTHON s
e
tt
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
Je
f
f King
statu
s
: reduce duplica
t
ed se
t
up
code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-07
J
eff
Ki
n
g
statu
s
: disable colo
r
for porc
e
l
ain
f
orma
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-05
Jeff King
reset: i
m
prove worktree
s
afe
t
y val
v
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-12-04
Jeff K
i
ng
rerere: don't s
e
gfault on fai
l
ure to open rr-c
a
che
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-26
Jeff
K
ing
tests:
r
ename du
p
licat
e
t10
0
9
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-24
Jeff King
p
rune-packed:
o
nly s
h
ow progress
w
h
e
n
s
tderr is a tty
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Je
f
f King
diff
c
or
e
-break: save
c
nt_data
for other
phases
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-16
Jeff
King
diffcore-break
:
free
files
p
ec data
as
w
e
go
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-11-09
Jeff King
format-pa
t
c
h
: make "-p" suppre
s
s diffstat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
J
e
ff King
push: fix
ty
p
o
i
n
u
sage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff K
i
ng
t915{
0
,
1
}: use
$
TE
S
T_DIRECTO
R
Y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-30
Jeff King
l
s-fil
e
s
:
unbrea
k
"ls-files -i"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff Kin
g
add-
i
nterac
t
ive: handle deletion of empt
y
file
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-28
Jeff Ki
n
g
gitign
o
r
e
: r
o
o
t mos
t
patterns at the top-level directory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-26
J
e
f
f
King
push: always load
default config
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-20
Jeff King
i
map-send: re
m
o
v
e useless uid code
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff Ki
n
g
cvsimpor
t
: fix relative
a
rgument filenames
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-19
Jeff
K
ing
d
o
cumen
t
p
u
sh's new
quiet option
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-12
Jeff Kin
g
l
s-files: excludes should
not impact tracked
fi
l
es
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-10-09
J
e
ff King
pull: improve advice
for
u
nconfigured err
o
r case
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-29
Jeff King
imp
r
ove refl
o
g
date/num
b
er
h
eur
i
s
ti
c
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff K
i
ng
rebase: use plumbi
n
g to show dirty state
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Je
f
f King
st
a
tus: make "how
t
o stag
e
" messages optional
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-12
Jeff
King
push: make non-fast-forwa
r
d
h
elp
m
essage co
n
figurabl
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
push: re-flow non-fast-for
w
ard message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
eff King
push: f
i
x englis
h
in non
-
f
a
st-forward message
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
docs: note t
h
at status config
u
ration affects
o
nly lon
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
commit: support alternate
status
f
orma
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff
King
status: a
d
d --p
o
rcela
i
n
ou
t
put
f
ormat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
status: re
f
actor format o
p
tio
n
pars
i
ng
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
Jeff King
sta
t
us: refactor
s
hor
t
-mod
e
printin
g
t
o
its own funct
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-06
J
eff Ki
n
g
sta
t
us: typo fix i
n
usage
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
Je
f
f
K
i
ng
push: teach --q
u
iet
t
o suppress "Everything up-
t
o-date"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-09-03
J
eff King
clone: disconnect transp
o
rt a
f
t
er fetchin
g
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
J
e
ff King
fix approxidate parsing of
rela
t
ive mo
n
ths and years
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Jeff K
i
ng
tests: add date printi
n
g and
par
s
in
g
t
e
s
t
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-31
Je
f
f
King
refa
c
tor te
s
t-d
a
te interface
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-27
J
e
ff King
clone
:
add --branch option to select
a
diffe
r
ent HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-25
Jeff
K
ing
check
o
ut: do not imply "
-
f" on u
n
b
orn
branches
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-18
Jeff King
tests: d
i
sa
b
le interactiv
e
hunk selection t
e
s
ts if
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-17
J
e
f
f King
docs
:
d
escrib
e
impact of r
e
pa
c
k on "clone
-
s"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-12
Jeff King
allow pull
-
-reb
a
se o
n
branch yet
t
o
be bo
r
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jeff King
merge: i
n
dicate re
m
ote tracking
branches in merge m
e
ssag
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2009-08-09
Jef
f
K
i
ng
m
e
rge: fix incorrect
m
erge m
e
ssag
e
for
ambigu
o
us t
a
g
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
next