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-03
Ju
n
io
C H
a
mano
merge-recursive: use xd
l
_merge(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Haman
o
xmer
g
e: make retur
n
value
f
rom xdl
_
merge(
)
mo
r
e usa
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio
C Hamano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
ano
g
it-m
e
rge: fi
x
confusio
n
b
etween tag and branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Jun
i
o C Hama
n
o
Merge master
.
k
e
rne
l
.
o
r
g
:
/p
u
b/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
J
unio
C
H
amano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Haman
o
tu
t
orial:
t
alk abou
t
user
.
name
e
arly
a
nd don't st
a
rt
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ham
a
no
Me
r
ge branc
h
'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
git blame
-
C
:
f
i
x
output
format tw
e
aks when crossin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Hama
n
o
cvsimport: s
t
yle fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge bran
c
h 'js/shortl
o
g'
commit
|
commitdiff
|
tree
2006-11-27
Junio C H
a
mano
M
erge
b
ra
n
ch
'jc/push-
d
elete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branc
h
'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io
C
Hama
n
o
git
-
m
erge: do
n
o
t leak rev-
p
arse output used for c
h
ecking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Hamano
g
it-merge: tighte
n
er
r
or checking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C Hamano
M
e
r
ge
b
ranch '
j
c/pack
-
p
e
eled'
commit
|
commitdiff
|
tree
2006-11-26
Jun
i
o C Hamano
g
r
ep: do
n
ot skip unm
e
r
ged en
t
ries when grepping in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio
C Hamano
M
er
g
e
branch
'jn/
w
eb'
commit
|
commitdiff
|
tree
2006-11-25
J
u
ni
o
C
Haman
o
fetch-pack: do
n
ot
barf when duplicate re pat
t
ern
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
H
amano
g
it-fetch:
a
llow
f
orcing glob pattern in refsp
e
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
Mer
g
e branc
h
'm
a
s
ter' into jc/gl
o
b
f
etch
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hama
n
o
git-fetch: exit with non-zero status when
fa
s
t-forward
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hama
n
o
git-sh
o
rtlog: make common repository prefix c
o
nfigurable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
unio C Haman
o
gi
t
-sh
o
rtlog
:
fix c
o
mmon rep
o
sit
o
ry
p
refix abbreviatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ham
a
no
g
it-branch -D: make
it wo
r
k
even when on a yet-to-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Haman
o
git-c
l
on
e
:
stop du
m
b protocol
fro
m
c
opying refs outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C Ham
a
no
gitweb: (style) use chomp without paren
t
heses c
o
n
sist
e
ntly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
H
a
m
a
no
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
Ju
n
i
o
C Hamano
Merge branch 'jn/w
e
b
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Me
r
ge branch 'pb/dif
f
root'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C
H
amano
M
erge
b
ran
c
h 'jc/pack-
h
euristi
c
s
'
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
io
C
Hamano
Merge branc
h
'
j
c
/nums
t
at'
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
i
o
C Hama
n
o
Merg
e
branch
'
ap/bran
c
h-ref
-
d
i
s
p
la
y
'
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io C H
a
mano
M
erge branch 'ap/prune'
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
man
o
Typ
e
fix b
u
iltin-pr
u
n
e
.
c::prune_object()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branch 'jc/upl
o
ad-pack'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
refs
outside refs/{heads,tags} match le
s
s strongl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ha
m
a
n
o
git-fetch:
allow
glob pattern in refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
mano
git-fetch:
fix dumb protocol transport to fetch
f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C H
a
mano
git-fetch:
reuse ls-re
m
ote result
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Jun
i
o C Ha
m
ano
G
I
T 1
.
4
.
4
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Junio C Hamano
tr
u
st
-
executable-bi
t
: fix brea
k
a
ge for symli
n
ks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
J
u
nio C Hamano
Store pee
l
ed refs in packed-re
f
s (take
2)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
Juni
o
C Hama
n
o
merge: al
l
ow merging into a ye
t
-to
-
be
-
born b
r
anch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
J
unio C Hamano
g
i
t-merge: make it usable as
the first class UI
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-22
J
u
nio C Hamano
remove merge
-
rec
u
r
si
v
e-ol
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
Junio C Hamano
S
t
ore
p
eel
e
d ref
s
in packed-
r
efs file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
Junio C
H
amano
d
o
_for_each
_
ref: perform the
same sanit
y
check f
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-20
Junio
C Hamano
git-fetch: follow lightweit ta
g
s as well
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-17
Junio C
H
amano
pack-ob
j
ects: twea
k
"do no
t
even attempt delta" heu
r
i
stics
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Jun
i
o C Ham
a
no
convert-objects: set _XOPEN_SOURCE to 600
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Juni
o
C Hamano
gi
t
-c
h
eckout: a
l
low pa
t
hsp
e
c to recover los
t
w
orki
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
J
u
nio
C Hamano
git-
c
heckout: do not allow
-
f and -m at
t
he
s
a
me
ti
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
Junio C Haman
o
apply
-
-
n
umstat: mark binary diff
s
t
at with - -, no
t
0 0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-15
J
u
n
io C Hamano
G
I
T
1
.
4
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-13
Junio C Hama
n
o
Merge br
a
nch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2006-11-12
Junio C Hamano
GIT 1
.
4
.
4-
r
c2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-12
Junio C H
a
m
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-12
Junio
C
Ham
a
no
git-cvsserver: read from git
w
ith -z to get non-AS
C
I
I
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-11
J
unio C Hamano
Mer
g
e
b
ra
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2006-11-11
Junio
C
Hamano
path-list: fi
x
path-list-in
s
ert return value
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-10
Junio C Hamano
git-annot
a
te: fix
-S on graft file with
c
omments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-10
J
u
n
i
o
C Hamano
git-annotat
e
: no need t
o
exec
b
lame; i
t
is built-in
.
.
.
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
D
o
cumentati
o
n:
m
ove blame ex
a
m
p
l
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-09
Junio C Ham
a
no
gi
t
web:
f
ix unmatched di
v
in commitdiff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Junio
C
Ha
m
ano
g
i
t
web: protect commit
messages fr
o
m control
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Jun
i
o C Haman
o
gitweb
:
protect blob
a
nd diff outp
u
t
lines from controls
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-09
Junio C
H
amano
git-pick
a
xe: reti
r
e pick
a
xe
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
Merge
g
it://git
.
ke
r
nel
.
or
g
/pub
/
s
cm/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-11-08
Ju
n
io C Hama
n
o
git-s
t
atus: quote LF in its output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
gitweb:
d
o not give blame link u
n
con
d
itionally
i
n diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
J
unio C H
a
m
ano
gitweb:
min
i
ma
l
ly fix
"
f
ork" support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
gitweb:
fix disabling of "f
o
r
k
s
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Hamano
GIT 1
.
4
.
3-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-08
Junio C Ham
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-11-08
Junio C Haman
o
Merge bra
n
ch '
j
c/pickaxe'
commit
|
commitdiff
|
tree
2006-11-08
Ju
n
io C Ha
m
ano
git-pickaxe: allo
w
"-L <s
o
mething>,+N
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-07
Junio C
Haman
o
M
erge branch 'jc/read-tree'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
M
e
rge br
a
nch 'np/index-pack'
commit
|
commitdiff
|
tree
2006-11-07
Junio C Hamano
Merge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2006-11-07
Junio C
Hamano
git-p
i
cka
x
e: -L /rege
x
p/,/re
g
exp/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-06
Junio
C
Hamano
Document git-pack-ref
s
a
nd link it to git(7)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-06
Junio C
Hamano
a
djust_shared_pe
r
m:
chmod(
)
only when needed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Juni
o
C Hamano
git-pickaxe: optimize by avoiding
repe
a
t
e
d r
e
a
d
_sha1_file(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
git-blame
:
a
d
d
i
nter
n
al statistics to count read blobs
.
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
cherr
y
is built-in, do
n
ot ship
git-cherry
.
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hama
n
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-11-05
J
unio C Hamano
git-pickaxe: fix ori
g
i
n
refcounting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hamano
Merge branc
h
'
n
p/verbose-push'
commit
|
commitdiff
|
tree
2006-11-05
Junio C H
a
m
a
n
o
Me
r
ge
branch 'lt/push-
c
onfig'
commit
|
commitdiff
|
tree
2006-11-05
J
u
ni
o
C
H
ama
n
o
M
e
rge branch
'p
b
/web'
commit
|
commitdiff
|
tree
2006-11-05
Junio C Hama
n
o
git-
p
ickaxe:
r
e-scan the
b
lob afte
r
making
p
r
o
gress
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Junio C Hama
n
o
g
i
t-pickaxe:
re-scan
t
he blob after
m
aking
p
rogress
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Jun
i
o C Hamano
git-
p
ickaxe:
sim
p
lify Octo
p
us me
r
ges furt
h
er
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Jun
i
o C
H
amano
git-picka
x
e: re
n
ame detection optimizati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-04
Junio C Hama
n
o
M
erge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2006-11-04
Ju
n
io C
Hamano
a
p
p
l
y
:
ha
n
dle "traditional" crea
t
ion/del
e
tion
diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next