repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
simplify inclusion of system header files.
2006-12-20
Jun
i
o C Hamano
sim
p
lify inc
l
u
s
i
on of s
y
stem
h
e
ader
f
iles
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hama
n
o
c
o
nfig_rename_sect
i
o
n
: f
i
x FILE* leak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hama
n
o
fix
p
opulate-filespec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
io C
Ha
m
ano
rerere:
f
ix
b
reaka
g
e of resolv
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
racy
-
git:
d
o
c
umentation upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
ni
o
C Hama
n
o
sh
o
w-
r
ef: fix --ex
c
lude-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
par
s
e-remote::e
x
pan
d
_refs_wi
l
dcard(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
mano
show-ref: fix --
v
erify
--h
a
sh=l
e
ngth
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Hamano
sh
o
w-ref: fi
x
--quiet
-
-verify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C
Hamano
Merge b
r
a
nch 'jc/blame-b
o
undary'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
M
erge
branch 'jc/reflog'
(early
p
a
r
t)
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C Hamano
Mer
g
e branch 'js/branch-con
f
ig'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
Merge
b
ranch 'j
n
/web' (early
p
art)
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
avoid accessing _all_ l
o
o
se refs
i
n git
-
s
h
ow-r
e
f -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
J
u
nio C Haman
o
git
-
fetch:
Avoid reading pa
c
ked refs ove
r
and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ha
m
ano
Te
a
ch
show
-
bra
n
c
h how
to show r
e
f-lo
g
dat
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
markup fix in svnimport d
o
cumentati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C Hamano
Fix mis-mark-up in
g
it-merge-file
.
txt documentati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C Hamano
Fix
c
heck_f
i
le_directory_conflict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
git-add
:
rem
o
v
e
c
onflicting en
t
r
y
when addi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Haman
o
upd
a
t
e-
i
ndex:
make D/F conflict error a bit more verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Hama
n
o
merge:
g
ive a bit pr
e
ttier merge message to "me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Merge branch 'js/
s
h
o
w'
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio
C
Hamano
git-r
e
set [--mixed]
<tree> [-
-
]
<
pa
t
hs>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C Haman
o
git-rese
t
: mak
e
it work
f
rom within
a
sub
d
i
r
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
git-fetc
h
: m
a
ke it work fro
m
within a s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
Upd
a
te git-diff documentati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Ham
a
no
Merg
e
branch 'jc/dif
f
-
-cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
g
i
t-svn: allow both
diff
.
col
o
r a
n
d
color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
an
o
c
o
nfig docum
e
ntation: group col
o
r items together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
a
no
git-b
l
ame: show
lines attributed to bound
a
ry commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge
b
r
anch 'jc/read-tree-
i
g
n
ore
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
ano
Merge branch 'ew
/
rerere'
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C
H
amano
M
e
rge b
r
an
c
h 'np/addco
m
mit'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
Merge br
a
nch '
l
h/bra
n
ch-rena
m
e'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch
'
jc/commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
a
mano
Merge branch
'ap/clon
e
-origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
m
a
n
o
Merg
e
b
ranch '
j
c
/
numstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
erge branch '
r
r/cvsexportcommit'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
Hamano
Merge br
a
nch 'ap/branch'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
H
ama
n
o
bran
c
h --color: change default co
l
or selec
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hama
n
o
Merge
branch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C Hamano
send-pack: t
i
ghten checks for
r
e
m
o
te names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C
H
amano
git-push: ac
c
ept tag <tag> as a
d
vertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
spurio
u
s
.
sp in ma
n
pages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
a
mano
git mer
g
e: reword failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ham
a
no
Revert "git-di
f
f: Introdu
c
e --inde
x
and de
p
recate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
g
i
t
-
push: do
c
ument
remov
a
l of remote ref with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
rge branc
h
'master
'
into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
rge
branc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
add t
e
st case for recursive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
Hamano
d
i
f
f --numstat:
s
how
bina
r
y
w
ith '-' to match "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
sh
o
rtlog: fix segfault
o
n empty authornam
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C Hamano
sho
r
tlog: remove
"[P
A
T
CH]"
p
refix from shor
t
log output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2006-12-10
Junio
C
Hamano
gi
t
-commit: allow --only to lose
what was staged earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C
Hamano
Documen
t
ation/git-commit
:
r
ew
r
it
e
to make i
t
more end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
unio C
Hamano
git-rerere:
a
d
d
'
gc' command
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C
H
amano
Fix
perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Haman
o
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hama
n
o
git
-
mer
g
e: f
i
x "fix conf
u
sion between tag and
b
ran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ha
m
ano
g
i
t-m
e
rge:
sque
l
ch n
e
edl
e
ss error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
i
o
C Hamano
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Merge
b
r
a
nch
'
m
ain
t
'
commit
|
commitdiff
|
tree
2006-12-06
J
unio
C
Hamano
git-reset to rem
o
ve "$GIT
_
DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C Hamano
re
a
d-tre
e
:
do
c
ument
--exclude-per
-
directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ha
m
ano
Loosen
"work
i
ng
file wil
l
b
e
lo
s
t" check in Porcelain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
r
e
ad-tree
:
further loosen "working file wi
l
l be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio C Hamano
Me
r
ge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C Ha
m
ano
unpack-trees: make sure "df_con
f
lict
_
entry
.
n
ame" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
u
nio C Ham
a
no
re
c
eive-pack:
d
o
n
ot insist on fast-forward
o
utside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Jun
i
o C Haman
o
merge-recur
s
ive: use xd
l
_m
e
rge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
ano
xmerge: ma
k
e retu
r
n va
l
ue fro
m
xdl_merge() mor
e
usabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
M
e
rge b
r
anch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
g
it-merge:
f
i
x
c
o
n
fus
i
on bet
w
een
tag an
d
branc
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
unio C
H
ama
n
o
Merge ma
s
t
e
r
.
kernel
.
o
r
g:/
p
ub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Haman
o
Merge branch
'
ma
i
n
t'
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C
H
amano
tutoria
l
: talk about use
r
.
name early and d
o
n
't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C Hama
n
o
Merge branch 'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Haman
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Jun
i
o C Hama
n
o
g
i
t b
l
ame -C: fix
ou
t
put
form
a
t tweak
s
wh
e
n cro
s
sing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
cvsimport:
s
t
yle fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Hamano
Merge branc
h
'js/sho
r
tlog'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Me
r
ge b
r
a
nch 'jc/push-de
l
ete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C H
a
mano
Merge branch 'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
gi
t
-mer
g
e: do not
l
eak
r
ev-parse output used
f
or checking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
git-me
r
ge: ti
g
hten
e
rror checking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
ni
o
C Hamano
Merge branc
h
'jc/pac
k
-
p
e
e
led
'
commit
|
commitdiff
|
tree
2006-11-26
Junio C
H
a
mano
grep: do not
s
ki
p
un
m
erged
entrie
s
w
hen grepping
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio
C H
a
m
a
no
Mer
g
e branch 'jn/web
'
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Ham
a
no
fetch-pack: do not barf
w
hen du
p
licat
e
r
e patterns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io
C
H
amano
g
i
t-fetch: allow
f
orcing glob
p
attern
i
n refspe
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
H
amano
Mer
g
e branch
'master' into jc/globf
e
tch
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Hamano
git-fetc
h
: exit with non-zero status
w
h
e
n fast-forward
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
gi
t
-comm
i
t: sho
w
-
-sum
m
a
r
y
after success
f
ul commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Haman
o
g
it-shortl
o
g: make com
m
on repos
i
tory pref
i
x co
n
figurable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ham
a
no
g
i
t-shortlog: f
i
x com
m
on r
e
po
s
itory prefix abbre
v
ia
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
u
n
io
C
Ham
a
no
g
i
t
-
branch -D: m
a
ke i
t
work even when
on a y
e
t-to-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next