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
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-28
Jef
f
K
in
g
commit: fix pre
t
ty-
p
rinting of messag
e
s with
"
\nencodin
g
"
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff
K
ing
t/t6006: add tests for a slig
h
tly more complex commit
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
Fix "--pr
e
tt
y
=format:" encoding item
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Kin
g
Add so
m
e basi
c
tests of rev-list --pretty=format
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
-
-pretty=
f
ormat
:
fix
br
o
ken %ct
a
nd %at interpolati
o
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-27
Jeff King
git-
r
m:
d
on't remove newly
a
d
d
ed file without
-f
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-12
Jeff King
New fas
t
-import test c
a
s
e for valid tree sorting
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-12
Jeff
K
ing
fast-im
p
or
t
: grow tree storage
m
ore a
g
gressivel
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-03-10
Jeff King
Docum
e
ntation:
s
/
s
eperator/
s
eparator/
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-28
Je
f
f
King
Add
a
sample prog
r
am 'blameview'
to show how to
u
se
.
.
.
commit
|
commitdiff
|
tree
2007-01-26
J
eff King
diffcore
-
pickaxe: fix i
n
fi
n
ite loop on zero
-
length
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-23
Jeff
King
contrib
/
vim: update syntax
f
or
c
hanged
comm
i
t template
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-23
J
e
ff King
f
or
m
at
-
patch: fix b
u
g
wi
t
h --stdou
t
in a subdirecto
r
y
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-15
Jeff King
git-pull
:
d
i
s
a
llow implicit merging to detache
d
HEAD
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2007-01-09
Je
f
f
King
get
_
tre
e
_en
t
ry: map
blank reques
t
e
d
entry to tree roo
t
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-12-18
Jeff King
vim
sy
n
ta
x
: follow recent changes to com
m
it
template
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-12-09
Jef
f
King
s
h
ortlo
g
: fi
x
se
g
f
a
u
l
t on e
m
pty authorname
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-11-06
Jeff King
Fix gi
t
-runstatus for repositories cont
a
i
ni
n
g a fil
e
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-11-02
Jeff King
git-pickaxe:
work pr
o
pe
r
ly in a su
b
directory
.
[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
Jef
f
King
git-
r
ep
a
c
k
: allow git-repack to run
i
n subdire
c
tory
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-20
Jeff Kin
g
rev-list: fix segfault
with --{author,comm
i
tter,gr
e
p}
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-18
Jeff
K
ing
g
itignore: git-show-ref is a
g
e
nera
t
ed file
.
commit
|
commitdiff
|
tree
2006-09-18
Jeff King
g
i
tign
o
re
:
git-pack-refs is
a
generated file
.
commit
|
commitdiff
|
tree
2006-09-18
Jef
f
Kin
g
wt-s
t
atus
:
use sim
p
lified resolve_ref to
f
i
n
d cur
r
e
n
t
.
.
.
commit
|
commitdiff
|
tree
2006-09-14
Jeff Kin
g
wt-st
a
tus: remove
e
xtraneous
newline
from 'delet
e
d
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-13
Jeff King
contrib/vim: add
s
ynt
a
x highlighting fil
e
for c
o
mmits
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-13
Jeff King
git-status: document c
o
lor
i
z
ation
conf
i
g
options
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-08
Jeff King
git-commit
.
s
h: conver
t
run_status t
o
a C bu
i
lti
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-08
Jeff King
Move
c
olor option
p
arsin
g
out of diff
.
c and into col
o
r
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-09-07
Jeff King
dif
f
: support custom callbacks
f
or output
commit
|
commitdiff
|
tree
2006-08-08
Jeff King
g
it-push: allow
pushing fr
o
m
s
u
b
directories
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
J
e
ff King
g
i
t
we
b
: option
a
ll
y
read config
f
rom GITWEB_CONFIG
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
Jeff K
i
ng
git-annotate: remove extraneous de
b
ugging lin
e
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
Jeff Ki
n
g
Documentat
i
o
n
: conve
r
t u
s
es of git-link mac
r
o to gitlin
k
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
Jeff King
git
-
push: re
m
ov
e
obsolet
e
g
i
t
-
push
.
sh
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-08-02
Jef
f
King
git
-
push: all
o
w -
f
as an ali
a
s for -
-
force
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-07-24
Jeff King
Colorize 'commit' lines
in log ui
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-07-24
Jeff
King
p
a
ck-objects
:
check pa
c
k
.
window for de
f
ault wi
n
d
o
w
.
.
.
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-06-28
Jeff Ki
n
g
quote
.
c: si
l
ence compiler warn
i
ngs from EMIT macro
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-06-23
Je
f
f King
git-comm
i
t: allow -e option anywhere on
c
ommand
line
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-06-02
Jeff King
sha1_file:
a
void re-preparing duplic
a
te pa
c
ks
commit
|
commitdiff
|
tree
2006-06-02
Jeff King
handle concurrent
p
run
i
ng of packed o
b
jects
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-05-25
Jeff King
c
v
simport: avoid "use" w
i
th :tag
commit
|
commitdiff
|
tree
2006-05-25
J
ef
f
King
cat-file: document
-
p option
commit
|
commitdiff
|
tree
2006-05-23
J
eff King
cvsi
m
po
r
t
:
s
et up commit env
i
ronment in perl
i
nstead
.
.
.
commit
|
commitdiff
|
tree
2006-05-23
Jeff King
cvsi
m
port: clea
n
up
c
ommit functio
n
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree
2006-05-23
Je
f
f King
c
vsimp
o
rt:
u
se
g
it-update-inde
x
-
-index-info
Signed-off-by:
Jeff King
<peff@peff.net>
commit
|
commitdiff
|
tree