repo.or.cz
/
git
/
kusma.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdl_merge(): fix and simplify conflict handling
2006-12-05
Johannes Sc
h
indeli
n
xdl_merge
(
): fi
x
and
s
implify
c
o
nflic
t
handling
commit
|
commitdiff
|
tree
2006-12-03
J
o
h
a
nnes
Schindelin
xdl_merge()
:
fix th
i
n
ko
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Jo
h
annes Sc
h
indelin
xdl_mer
g
e(): fix an off-by
-
o
ne bug
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
m
e
r
ge-rec
u
rsive: use xdl_merge()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
x
m
erge: make return value from xdl_
m
erge() more usable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Johan
n
es Schindelin
xdiff:
add xdl_merge()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C
H
amano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
E
r
ic Wong
git-sv
n
: avoid
f
e
tch
i
ng fil
e
s
tw
i
ce in the same revision
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C
H
amano
git-mer
g
e: fix confus
i
on
b
etween tag
a
nd branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andy Parkins
De-emphasis
e
the sym
b
olic
l
ink documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andreas
Ericsson
git-diff: In
t
r
oduce --index and
de
p
recate
--cached
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Ericsson
l
s-files: Gi
v
e hint
s
whe
n
e
r
r
ors happen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas
P
itre
pack-
o
bjects: remove
r
e
d
u
ndent statu
s
in
f
ormation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hamano
Merge
m
as
t
er
.
kernel
.
o
r
g:/pu
b
/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ham
a
no
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2006-11-29
Andy Parkins
Docume
n
t g
i
t-repo-config --bool/--int options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tut
o
rial: t
a
lk about user
.
na
m
e early and
don't start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Al
e
x
R
i
esen
git-bla
m
e: fix rev
parameter handli
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge branch 'j
c
/glob
f
etc
h
'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C
H
amano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2006-11-29
Jun
i
o
C
H
amano
git bl
a
me
-
C: f
i
x
outp
u
t format tweaks wh
e
n crossing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric W
o
n
g
git-svn: fix multi
-
init
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Er
i
c Won
g
git-svn: doc
u
menta
t
ion upd
a
tes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
E
ri
c
Wong
git-
s
vn: c
o
l
o
r s
u
pp
o
rt for the log
command
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Han-Wen Nienhuys
ident
.
c: Trim hint
p
rinte
d
w
h
en gecos is empty
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
P
e
arce
Fi
x
broke
n
bash complet
i
o
n
of loc
a
l refs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pea
r
c
e
Te
a
ch bash how t
o
complete
long options for git-comm
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Er
i
c W
o
n
g
git-svn: fix output reporting
f
rom
the delta fetch
e
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: error out w
h
en the SVN conn
e
ction
f
ail
s
dur
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
René Scharfe
shortlog: remove range check
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: up
d
at
e
test
s
for
recent changes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: en
a
ble delta transfers during fe
t
ches
wh
e
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
J
oha
n
ne
s
Sch
i
ndelin
s
h
a1_o
b
ject_
i
nfo(): be
c
onsis
t
ent wit
h
read_sha1_fi
l
e
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Johannes Schi
n
delin
sh
o
rtlo
g
: use pag
e
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
c
vsimport: s
t
y
le f
i
x
u
p
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Eric Wong
git-svn: use
~
/
.
subver
s
ion config
f
iles w
h
en using
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
P
earc
e
Teac
h
bash
about g
i
t-am/gi
t
-apply and the
i
r whitespace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
c
e
Cache th
e
lis
t
of merge strategies and
a
vailable com
m
a
n
ds
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pe
a
r
ce
Sup
p
ort
-
-strategy=x completion in
a
ddition to --strategy
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach
b
ash ab
o
ut git-rep
o
-
c
onfig
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
a
r
ce
Support bash co
m
plet
i
on of
refs/remote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash about git lo
g
/sho
w
/whatchan
g
ed options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
wn O
.
Pea
r
c
e
Teach bash how to complete git-rebase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash how to complete git
-
cherry-pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Teach bash how to
c
omple
t
e
git-format-patc
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Add
current b
r
anch in
P
S1 support
t
o gi
t
-c
o
mpletion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
P
e
arce
Teac
h
bash how to complete options for git-name-rev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pea
r
ce
Hide plumbin
g
/transport commands fr
o
m
bash
c
o
m
p
letion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearc
e
Teach git-complet
i
on
.
bash how to c
o
mpl
e
te git-merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Se
a
n
U
p
d
ate docume
n
tat
i
on to
r
e
move i
n
correct GIT_DIFF_OP
T
S
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
M
erge branch 'js/shortl
o
g'
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Hamano
Merge
branch 'jc/push-delete
-
ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge
branch 'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Junio C
Hama
n
o
git-
m
erge
:
do not
l
e
ak rev-parse out
p
ut used for
check
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
amano
git-
m
erge: tighten error ch
e
cking
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge b
r
an
c
h
'
jc
/
pack-peeled'
commit
|
commitdiff
|
tree
2006-11-26
Junio C Ham
a
no
grep: do not skip unmerged e
n
tries wh
e
n g
r
epping in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Han-Wen Nienhuys
git-tag: allow empty tag
m
essage if -m
is given
e
x
p
licit
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Ju
n
io C Haman
o
Merge bran
c
h
'jn
/
web'
commit
|
commitdiff
|
tree
2006-11-26
J
.
Bru
c
e
F
iel
d
s
Docume
n
tation:
clarify tut
o
r
i
al pu
l
l
/me
r
ge disc
u
ssion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Jakub Narebski
gitweb: Make proje
c
t description in p
r
oje
c
ts
list li
n
k
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Eric
Wong
git-svn
:
a
llow SVN::
l
ib u
s
ers t
o
trac
k
the
roo
t
of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
a
k
ub
Narebsk
i
g
i
t
web: Use
a
uthor_ep
o
ch
for p
u
bdat
e
in gitweb feeds
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jakub N
a
reb
s
ki
gitweb: Add
a
utho
r
and contributor emai
l
to Atom
f
eed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Narebski
gitweb: Add author and committer email extr
a
ction to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
ak
u
b
Narebsk
i
gitweb: Use git-
s
how
-
ref i
n
stead of git-p
e
e
k
-remo
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
aku
b
Na
r
ebsk
i
gitweb
:
Do not use esc_
h
tml in
esc_
p
ath
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C Hamano
f
e
tc
h
-
p
a
ck: do no
t
barf
w
hen duplicate re patterns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o
C Hamano
g
it-
f
et
c
h: allow forcin
g
g
lob pattern
i
n
r
efsp
e
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Hamano
Merge branch 'master' int
o
jc/
g
lobfe
t
ch
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-
f
etch: exit with
no
n
-z
e
ro sta
t
u
s
when fast-forward
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Hamano
gi
t
-
s
h
o
rtlog: m
a
ke c
o
mmon repos
i
tory p
r
ef
i
x configu
r
able
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Ha
m
ano
git-shortlog: f
i
x c
o
m
m
on repository prefix abbrev
i
a
tio
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Eric
W
o
n
g
git-svn: exi
t
with status
1
for t
e
st fail
u
res
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Eric Wong
git-svn:
c
orrectl
y
access
r
epos when only given partial
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Haman
o
git-branc
h
-D: m
a
ke it wo
r
k even when o
n
a yet-to-be
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Lars Hjemli
A
dd
-
v and --abbrev options to git-bran
c
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
H
a
mano
git-clone: sto
p
dumb protocol from copying refs
outsi
d
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Ha
m
ano
git
w
eb: (
s
tyl
e
) use chom
p
without pa
r
e
n
these
s
c
onsistently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Jakub
N
a
r
e
b
s
ki
gitweb: Replace SPC with also in
tag
c
omment
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
unio C Hamano
Al
l
ow g
i
t
push to
delete remote ref
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Merge branc
h
'jn/web'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Mer
g
e bra
n
ch 'p
b
/di
f
f
r
oot'
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
io C Ham
a
no
M
e
rge branch
'jc
/
pac
k
-heuristics
'
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Ham
a
no
Merge branch
'
jc
/
numst
a
t'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C H
a
mano
Merge branch 'ap/b
r
a
n
ch-r
e
f-dis
p
lay
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
M
e
rge branch 'ap/prune'
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C
Hamano
Typefix builtin-prune
.
c::p
r
u
n
e_
o
bject()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Peter Baumann
c
o
nfi
g
option l
o
g
.
showr
o
ot to show
t
h
e diff of r
o
ot
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Haman
o
Me
r
ge br
a
n
c
h
'
j
c
/upload-pack'
commit
|
commitdiff
|
tree
2006-11-24
Eric
W
ong
g
i
t-svn: handle authentication w
i
t
h
ou
t
relying
on
cached
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
I
ñ
aki Arena
z
a
git-cvs
i
mport: ad
d
suppor
t
for CVS pserver met
h
od HT
T
P
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Petr
Baudis
Make git-clone --us
e
-
s
eparate-remote
t
h
e default
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C
Haman
o
ref
s
outsid
e
refs/{heads,tags
}
mat
c
h
less strongly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
And
y
P
arkins
Increase length of function na
m
e buffer
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
i
o
C Hamano
git-fetch: allow glob
pattern in r
e
fsp
e
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
g
it
-
fetch: fix dumb
proto
c
o
l transport
t
o fetch from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Haman
o
g
it-fetc
h
: reus
e
ls-remote
resu
l
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Eric
W
o
ng
g
i
t-svn: pr
e
serve unco
m
mitted changes after dcommit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Er
i
c Wong
git-svn: cor
r
ectly handle rev
i
sion 0 in SVN
r
epositories
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next