repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-28
Jeff K
i
ng
commit: fix pretty-pri
n
ting o
f
m
e
ssages with "
\
nenco
d
in
g
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Kin
g
t
/t6006: add tests f
o
r a slig
h
tly more complex commit
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-28
J
eff
K
ing
F
i
x "--pretty=format:"
e
ncoding item
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Ki
n
g
Add s
o
me basi
c
t
ests of rev
-
l
i
st --pretty=fo
r
mat
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Ki
n
g
--
p
retty
=
forma
t
:
fix broke
n
%
c
t
a
n
d
%a
t
interpola
t
i
on
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-27
Jeff King
git-rm: don't remove
n
ewly
a
dded file w
i
t
h
out -
f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-12
J
ef
f
King
New fast-import test case fo
r
valid tree s
o
rting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-12
J
eff King
fast-i
m
p
ort: grow tree s
t
orage mor
e
agg
r
essively
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-10
J
e
f
f King
Documentatio
n
: s
/
seperator/sepa
r
ator/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-28
Je
f
f
K
ing
A
d
d a sam
p
l
e
p
rogr
a
m 'blameview' t
o
show how
to
use
.
.
.
commit
|
commitdiff
|
tree
2007-01-26
Jeff K
i
n
g
di
f
f
cor
e
-pi
c
k
a
xe: fix in
f
inite loop
on zero-le
n
gth
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-23
Jeff Kin
g
contrib/vim: update
syntax
f
or chan
g
ed commit template
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-23
Jeff
K
ing
format-pat
c
h: fix bug with -
-
stdout in a
s
ubdirectory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-15
Je
f
f
King
git-pu
l
l:
disallo
w
implicit
m
e
r
ging to
d
etac
h
ed
HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-09
Jeff Ki
n
g
get_tree_entry: map blank requested entry to tree ro
o
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-12-18
J
eff King
vim syntax: fo
l
low re
c
ent
c
hanges t
o
commit t
e
mplate
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-12-09
Jef
f
King
shor
t
l
o
g: fix segfault
o
n e
m
pty author
n
a
m
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-11-06
Je
f
f King
Fix git-runstatus for repos
i
t
ories containing a file
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-11-02
Je
f
f
K
ing
gi
t
-pickaxe: work
properly in a
su
b
directo
r
y
.
[jc: interestingly enough,
Jeff King
had the same idea after I
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-25
Jeff
K
i
n
g
git-r
e
pack
:
al
l
ow git-repac
k
to
run in
subdirectory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-20
Jeff
K
ing
rev-list: fix segfault with -
-
{author
,
co
m
mitter,grep}
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-18
Jeff King
g
i
t
ignore: git-sho
w
-ref is a generated
f
ile
.
commit
|
commitdiff
|
tree
2006-09-18
Jeff King
gitignore: git-pack-refs is a gener
a
te
d
file
.
commit
|
commitdiff
|
tree
2006-09-18
Jeff K
i
ng
w
t
-
status:
use simp
l
ified resolve_ref to find current
.
.
.
commit
|
commitdiff
|
tree
2006-09-14
Jeff Ki
n
g
wt-status: rem
o
ve extraneou
s
n
ewli
n
e
f
rom '
d
e
l
eted
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-13
Jeff King
contr
i
b/vim: a
d
d
s
yn
t
ax h
i
ghlig
h
t
i
ng fi
l
e for co
m
mits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-13
Jeff King
git
-
status: document co
l
oriz
a
tion c
o
nfig
o
ption
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-08
Jeff King
gi
t
-commit
.
sh: conver
t
run_st
a
tus to a C b
u
iltin
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-08
Jeff
Kin
g
Move color o
p
t
i
on parsing
o
ut of di
f
f
.
c and
into col
o
r
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-07
Je
f
f Ki
n
g
d
iff: support custom callbacks for
o
utput
commit
|
commitdiff
|
tree
2006-08-08
Jeff Kin
g
g
i
t-pu
s
h: allow pushing from subd
i
rectori
e
s
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
Jeff King
gitweb: optionally read co
n
fi
g
from GITWEB_CONFIG
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
Jeff King
git-anno
t
ate
:
remove ex
t
r
an
e
ous debugging line
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
Jeff K
i
ng
Documentation: convert uses of git-link
m
acro to gitlink
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
Jeff King
git-pu
s
h
:
remo
v
e obsolete git-push
.
sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
J
e
ff Kin
g
g
it-push: all
o
w
-
f a
s
an
alia
s
fo
r
--
f
o
rce
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-07-24
Jef
f
K
ing
Co
l
orize 'commit' lines in lo
g
ui
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-07-24
J
e
ff
King
pack-objects: check pack
.
window f
o
r defa
u
lt
window
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-06-28
Jeff King
q
uote
.
c
:
silence compiler war
n
ings from
E
MIT
macro
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-06-23
Jeff King
git-commi
t
: al
l
ow -e
o
ption anywhere on comm
a
nd line
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-06-02
Je
f
f
King
sh
a
1_file: avoid re-pre
p
arin
g
duplicate packs
commit
|
commitdiff
|
tree
2006-06-02
Jeff King
handle concurrent pr
u
ning of packed objects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-05-25
Jeff King
cvsimport: avoid "use
"
with :tag
commit
|
commitdiff
|
tree
2006-05-25
Jeff K
i
ng
cat-fi
l
e: document -p option
commit
|
commitdiff
|
tree
2006-05-23
Jeff
K
ing
cvsimport: set up co
m
mit
environment in perl
i
nstead
.
.
.
commit
|
commitdiff
|
tree
2006-05-23
Jef
f
King
c
v
simport: cleanu
p
c
ommit fu
n
ct
i
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-05-23
Jeff King
c
v
simp
o
rt: use git-update-ind
e
x --index-i
n
fo
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree