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
Clarify kind of conflict in merge-one-file helper
2009-04-30
Alex R
i
esen
Clarify
k
i
nd
o
f
co
n
flict in merge-one-file
h
elper
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-30
A
l
ex Riesen
i
m
p
r
ove
error message in config
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
J
u
n
io C
Hamano
Merge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2009-04-29
Benjamin Kramer
daemon
.
c: fix segfault on
OS X
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Ha
m
ano
merge-recursive: do not die on a conflicting
s
ubmodule
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Felipe Contreras
git
co
n
fig: e
r
ror when editing a
repo config
and n
o
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Uwe Kleine-König
parseopt: fix d
o
cum
e
ntation for --keep-dashdash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
Joh
a
nnes
Schinde
l
in
Rename core
.
u
nreliabl
e
Hardlinks to core
.
creat
e
Object
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-29
J
unio C
H
amano
M
e
r
ge branch 'maint-1
.
6
.
1' in
t
o
maint
commit
|
commitdiff
|
tree
2009-04-29
Ju
n
i
o
C
Hamano
M
erge branc
h
'maint-1
.
6
.
0
'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Junio C
Hamano
diff -c -p: do not
d
ie on sub
m
odules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Er
i
c Bl
a
ke
doc: con
s
isten
t
ly use
ASCII
D
OC
_
EXTR
A
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Eric
Bl
a
ke
Makefile: instal
l
i
ng git in cy
g
win
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-04-28
Junio C Ham
a
no
Merge
branch 'maint-1
.
6
.
1'
into maint
commit
|
commitdiff
|
tree
2009-04-28
J
unio C Hamano
Merge b
r
anc
h
'maint-
1
.
6
.
0' i
n
to mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
S
am Vilain
SubmittingPatc
h
e
s
: itemize and re
f
le
c
t
u
p
on well wr
i
tten
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
Jeff King
Makefile
:
fi
x
NO_PERL bu
g
wi
t
h gitweb
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-28
L
inus
To
r
va
l
ds
grep
:
fix se
g
fault when "git grep '('" is given
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Joh
a
nnes Schindel
i
n
t
5
70
1
: do not get
s
tuck in empty-
p
u
s
h
/
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
P
a
trick Welche
NetBSD
compil
a
tion fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Allan Caffee
Docume
n
tat
i
on: fix a grammatica
l
e
r
r
o
r
i
n api-bu
i
ltin
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Allan
C
af
f
ee
bu
i
ltin-merg
e
:
fix
a
typo in an error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
M
a
r
k
Drago
Add
semicolo
n
to curl
y
br
a
ce group in mai
n
Ma
k
efile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-27
Johannes Sixt
p
r
u
n
e-packed: advanced progress even
f
or non-existing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-26
Linus
T
orvald
s
t
4
202: fix ty
p
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Johannes
Schindeli
n
A
dd an option not
t
o use li
n
k(src, d
e
st
)
&&
u
nlink
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
B
enjamin Kra
m
er
c
onnect: replace inet_ntop
w
ith getnamein
f
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
We
s
ley J
.
L
andaker
Documentat
i
o
n
: gi
t
-clean
:
make
descriptio
n
more readable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Wesley J
.
Landaker
Document
a
t
i
on: git-clea
n
: fix m
i
nor gramm
a
tical erro
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Si
t
aram Chamar
t
y
Remove obsole
t
e bug war
n
i
ng in m
a
n git-update-server
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Bra
n
d
o
n C
a
sey
t7700-repack
:
re
p
ack -a now w
o
rks prope
r
ly
,
e
x
pect
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Brandon Casey
t9001
:
use olde
r
Getopt::Long boolean prefix '--no
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Ni
c
ol
a
s
Pitre
progr
e
ss bar:
round to t
h
e neare
s
t instead of truncating
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
J
u
nio C Hamano
GIT 1
.
6
.
3-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-25
Junio C
Hama
n
o
Merge
branc
h
'maint
'
commit
|
commitdiff
|
tree
2009-04-25
Junio
C
Hamano
Merge branch 'maint-1
.
6
.
1' into
m
a
i
nt
commit
|
commitdiff
|
tree
2009-04-25
J
u
nio C
Hamano
Merge branch 'maint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-24
Jeff
King
t7
8
00
:
resp
e
c
t
N
O_PERL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-24
Johannes Sixt
re
m
ote
.
c: do not trigger remote
.
<name>
.
<var> codepath
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-24
Johannes Sixt
bu
i
ltin-hel
p
: si
l
e
n
tly
t
oler
a
te unknown
k
eys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-24
Alex
R
ie
s
e
n
Expla
i
n seemingly
pointle
s
s use
of syste
m
in difftool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Junio C Hama
n
o
Makef
i
le:
igno
r
e per
l
/
s
ubdirectory under N
O
_PE
R
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
St
e
phen
Boyd
confi
g
.
t
x
t:
M
a
ke
c
on
f
igurat
i
o
n parag
r
aph more c
o
n
sistent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
c
o
nf
i
g
.
t
xt: cl
a
r
i
f
y sentences i
n
the configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
S
tephe
n
Boyd
conf
i
g
.
txt:
a
dd
m
issing 'the
'
s and ma
k
e words plura
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Step
h
en Bo
y
d
git
-
format-patch
.
tx
t
: gen
e
ral rew
o
r
dings and cl
e
an
u
ps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
git-sho
w
-branch
.
txt: cleanup example d
e
scr
i
p
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
Docu
m
entat
i
o
n
: use l
o
wercase
f
or
s
hallow
a
nd
d
eep threading
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Steph
e
n Boyd
co
n
fig
.
t
xt: add missing fo
r
mat
.
{subjectprefix,cc,a
t
tach
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
tes
t
-g
e
nrandom: A
d
d
ne
w
l
in
e
to us
a
ge str
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Junio
C
H
amano
Merge
b
ranch 'jc/
m
aint-re
a
d-tree-multi
'
commit
|
commitdiff
|
tree
2009-04-23
Bill Pemberton
A
dd parsing
of elm aliase
s
to git-send-email
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Dan Loewenhe
r
z
Convert to use
q
uiet opti
o
n
w
hen available
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
M
ichael J Gruber
Fix more ty
p
os/spell
i
ng i
n
comments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Mi
k
e Ralphson
F
ix typos /
s
pelling in comments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Wesle
y
J
.
Landake
r
D
o
c
u
m
e
ntat
i
on: git-svn:
f
ix a gr
a
mm
a
ti
c
al
e
r
ror withou
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
We
s
le
y
J
.
La
n
d
a
ker
Documen
t
ation
:
git-svn: fix s
p
urio
u
s bolding that mangl
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Al
e
x Riesen
Wait for git diff t
o
finish in
git difftool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Allan Caffee
g
ra
p
h
A
PI: fix a bug i
n
the
r
e
n
de
r
ing of oc
t
opus mer
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
A
l
lan Caffee
grap
h
API: fix ex
t
ra space
d
uring
p
re_
c
ommit_line sta
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-23
Al
l
an Caffe
e
t4202-log: exte
n
d test
c
overage of gra
p
h
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-21
Junio C Hamano
Rev
e
rt "sta
t
_trac
k
i
n
g_info(): only count
r
e
al commits"
commit
|
commitdiff
|
tree
2009-04-21
Michael
J
Gruber
t
e
st-lib
.
s
h: Help t
e
st_create_
r
epo() find the templates dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-21
Junio C Hamano
Me
r
ge branc
h
'mk/
m
aint-apply-swap'
commit
|
commitdiff
|
tree
2009-04-21
Juni
o
C H
a
mano
M
e
rge branch
'
maint
'
commit
|
commitdiff
|
tree
2009-04-21
Markus Heidelberg
grep: don't
suppor
t
"gre
p
.
color"-like config optio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Mike Ralphson
Do
c
umentation: fix typos / spelling
mistakes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Mike Ralphson
builtin-remote: fix typo in
o
ption
descr
i
ptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
M
atthieu Moy
c
l
one: add t
e
st
f
o
r
push on
an empty
c
lone
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kied
r
owicz
tests: make tes
t
-apply-cris
s
-cross-rename m
o
re ro
b
ust
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedrowic
z
built
i
n-apply: keep
information ab
o
ut fi
l
es
t
o
be deleted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Michał Kiedrowic
z
tests: test
a
pplying cri
s
s-cross
r
ena
m
e patch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Frank Lichten
h
eld
gitcvs-migratio
n
:
L
ink to git-cvsimpor
t
documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Johan
n
es Schindel
i
n
F
ix
off-by-o
n
e in re
a
d_tree
_
recursi
v
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Joh
a
nnes
S
i
xt
Wind
o
ws: Skip
f
s
tat/lstat
o
ptimization i
n
write_entry()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C
Hamano
c
heckout branch
:
prime cache-tree ful
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Juni
o
C
Hamano
r
ead-tr
e
e
-m A
B
: prim
e
cache
-
tree from th
e
switched
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Ju
n
io
C
Ha
m
ano
Move prime_cach
e
_tree() to
c
ache
-
t
re
e
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Juni
o
C H
a
mano
read-tree A B: do not corrupt cache-tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Johann
e
s Sixt
Windows
:
W
ork a
r
ound i
n
t
ermit
t
ent
f
a
ilures in mingw
_
rename
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Hol
g
er We
i
ß
gi
t
web: Fix snapshots requ
e
sted via
P
A
T
H_INFO
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio C H
a
mano
Merge branch
'
mm/main
t
-
a
dd-
p
-quit'
commit
|
commitdiff
|
tree
2009-04-20
Winc
e
n
t
C
o
l
aiuta
git add -
p
: add
missing "q" to patch prompt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Junio
C
Hamano
Sync wi
t
h 1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Jun
i
o C Hamano
G
IT 1
.
6
.
2
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-20
Nguyễn Thái Ngọc Duy
M
a
k
e
f
ile:
remove {fetch,send}-pack
from PROG
R
AMS as
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
J
u
nio C Hamano
Merge branch 'ef/maint-fa
s
t-export' into m
a
int
commit
|
commitdiff
|
tree
2009-04-19
Junio
C
Hamano
M
e
rg
e
branch 'mm
/
ma
i
nt-add-p-quit' into maint
commit
|
commitdiff
|
tree
2009-04-19
Junio C
H
amano
M
e
r
g
e branch 'lt/mai
n
t
-
reflog
-
e
xpir
e
'
into maint
commit
|
commitdiff
|
tree
2009-04-19
Junio C Hamano
M
er
g
e bran
c
h '
j
c
/
mai
n
t-shar
e
d-literally' i
n
to maint
commit
|
commitdiff
|
tree
2009-04-19
Matthie
u
Moy
Update
g
i
t
-add
.
txt accor
d
ing to th
e
new possibilities
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
J
e
ff King
add-intera
c
t
i
v
e:
r
efac
t
or mo
d
e hun
k
han
d
l
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Matthieu M
o
y
git add -p
:
new "quit"
command at the prompt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Juni
o
Hamano
Speed u
p
r
eflog pruning
o
f
u
nreachable commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
L
inus Tor
v
a
lds
Clean
up reflog unreachab
i
lit
y
p
r
uning decision
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye
-
Lund
bu
i
ltin-fast-export
.
c: handle nested tags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik
Faye-
L
u
nd
bu
i
lt
i
n-
f
ast-export
.
c: fix c
r
ash
o
n
tagge
d
trees
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Erik
Faye-Lund
bu
i
lt
i
n
-fast-ex
p
o
rt
.
c: turn error into warnin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-04-19
Er
i
k
F
a
ye-L
u
n
d
t
e
s
t-s
u
ite: addi
n
g a test for fast-
e
xpor
t
wit
h
tag
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next