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 Ries
e
n
Cla
r
ify
kind o
f
conflic
t
in me
r
ge-one-f
i
le h
e
lpe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-30
Alex R
i
esen
improve e
r
ror
message i
n
c
onfi
g
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C H
a
mano
M
e
rge br
a
n
c
h
'mai
n
t'
commit
|
commitdiff
|
tree
2009-04-29
Benja
m
i
n
Kramer
d
a
emon
.
c: fix segf
a
ult on OS X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Jun
i
o
C
Hamano
merg
e
-r
e
cursive:
d
o not die on a co
n
flicting
s
ubmodu
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Fe
l
ip
e
Cont
r
eras
git co
n
fig
:
error w
h
en editing a repo
c
onfig and not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Uwe
Kleine-
K
önig
parseopt:
f
i
x
d
o
cumen
t
ation for --keep-da
s
hdash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Johannes S
c
h
i
n
del
i
n
R
e
name core
.
u
nrel
i
a
bleH
a
rdlinks to core
.
createObject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Merge branch 'maint-1
.
6
.
1' into
m
aint
commit
|
commitdiff
|
tree
2009-04-29
Junio C Hamano
Mer
g
e branch
'
mai
n
t-1
.
6
.
0' into mai
n
t-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-29
Ju
n
io C
Ham
a
n
o
d
i
f
f -c
-p: do
not d
i
e on submo
d
ul
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Eric Blake
doc:
c
onsis
t
ently
u
se ASCIIDOC_EXTRA
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Eric Blake
M
a
kefi
l
e: installing git i
n
c
ygwin 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge bran
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2009-04-28
Junio C Ham
a
no
Me
r
ge bran
c
h 'maint
-
1
.
6
.
1
' into maint
commit
|
commitdiff
|
tree
2009-04-28
Junio C Hamano
Merge branch 'maint
-
1
.
6
.
0' into ma
i
nt
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-28
Sam Vilain
SubmittingPatches:
i
t
emize and
r
efl
e
c
t up
o
n
well
w
ritten
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Jeff K
i
ng
Makefile: fix NO_PERL bug with gitweb
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-28
Linus Torva
l
ds
grep: fix segfault wh
e
n
"git grep '
(
'"
i
s given
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Jo
h
annes
S
c
hindelin
t5701: do not get stuck in em
p
ty-push/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Pat
r
ick Welche
NetBSD com
p
il
a
tion fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Alla
n
Caffee
Do
c
umen
t
ation: fi
x
a gram
m
a
t
i
c
al error
in ap
i
-builtin
.
t
xt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Allan Caffee
builtin-merg
e
:
fix a
typo i
n
an error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
Mark Dra
g
o
Add semicolon t
o
c
u
rly brace g
r
oup in ma
i
n Makefile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-27
J
ohanne
s
Sixt
prune-packed: advance
d
progre
s
s even for non-existing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-26
Linus To
r
v
a
l
ds
t4202
:
fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Johannes Schind
e
lin
Add an option not to use link(src, de
s
t) && unlink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Benjamin Kramer
connect: replace ine
t
_ntop
with getnameinf
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
We
s
le
y
J
.
L
a
n
dak
e
r
D
o
cumenta
t
ion: git-clean: make description more
r
eadable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Wesley J
.
Landaker
Docume
n
tatio
n
:
g
it-c
l
e
a
n: fix
minor grammat
i
c
a
l errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Sitaram Chamarty
Remove o
b
solete bug warn
i
ng in man gi
t
-update-server
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Br
a
ndon Casey
t
7700
-
repack: repack -
a
n
o
w
works
prop
e
rly, ex
p
ect
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Bra
n
do
n
Casey
t90
0
1:
u
se older Getopt::Long boolea
n
prefix
'
--no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Ni
c
ol
a
s Pitre
p
r
ogress bar:
round
t
o the
n
eare
s
t i
n
stead of
tr
u
nc
a
t
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Junio C
Hamano
GIT
1
.
6
.
3-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-25
Junio C Hamano
M
erge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2009-04-25
J
un
i
o C Hamano
M
e
rge branch 'maint-1
.
6
.
1' into
m
ai
n
t
commit
|
commitdiff
|
tree
2009-04-25
J
uni
o
C Hamano
Merg
e
branch 'mai
n
t-1
.
6
.
0' into
maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-04-24
Jeff King
t
7800: respect NO_PERL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-24
Johann
e
s Si
x
t
remote
.
c: do
n
ot t
r
igger remote
.
<name>
.
<var> codepath
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-24
Johann
e
s Sixt
builtin-help:
s
il
e
n
t
ly
tolerate unknown keys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-24
A
l
ex Riesen
Explain seemingly poin
t
l
ess use of s
y
stem in difftool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Jun
i
o C Haman
o
Makefile: ignore perl/ subdir
e
ctory unde
r
N
O
_PERL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
con
f
ig
.
txt: Make con
f
igur
a
tion paragra
p
h more consistent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Step
h
en Bo
y
d
config
.
txt: c
l
arify sentenc
e
s in the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Steph
e
n Boyd
conf
i
g
.
tx
t
: add missing 'the's and ma
k
e word
s
plu
r
a
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boy
d
git-format-patch
.
t
x
t: gener
a
l
re
w
ordings
and
c
leanup
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
git-show-
b
ranch
.
txt: cl
e
a
n
u
p exam
p
le de
s
cri
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boy
d
Docu
m
entatio
n
:
use lowercase for sha
l
low
and dee
p
threadi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Ste
p
hen Boyd
con
f
ig
.
txt:
add missi
n
g format
.
{subjectprefix,cc,attach
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Stephen Boyd
test-g
e
nrandom: Ad
d
ne
w
l
i
ne
to us
a
g
e
s
t
ring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
J
u
n
io C
Hamano
Merge bra
n
ch
'jc/ma
i
nt-rea
d
-tr
e
e-m
u
lti'
commit
|
commitdiff
|
tree
2009-04-23
Bill Pemberton
Add pars
i
n
g of e
l
m alias
e
s to
g
it-send-e
m
ail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Dan Lo
e
w
enh
e
rz
C
onvert to u
s
e quiet option when
a
vailable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
M
ich
a
el
J G
r
uber
Fix mo
r
e typo
s
/spellin
g
i
n
commen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Mike R
a
lphson
Fix typos
/
spelling
i
n
comments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
W
es
l
ey J
.
Landaker
Documentation: git-
s
vn: fix
a
gramma
t
ical error
without
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Wesley J
.
Landaker
Docum
e
nt
a
ti
o
n: git-
s
v
n: fix
s
pu
r
ious bolding
t
hat
m
a
ngles
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
A
le
x
R
i
esen
Wait for g
i
t
d
iff to finish in
g
it
d
ifftool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
All
a
n
Caffee
graph A
P
I
:
fix a bug in the r
e
n
d
e
ring of octopus me
r
ges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Allan Caffee
g
raph API: fix extra s
p
a
ce during pr
e
_co
m
mi
t
_l
i
n
e stat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-23
Allan Caf
f
ee
t4202-log: ext
e
nd te
s
t co
v
erage
of graphing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-21
Ju
n
io C H
a
ma
n
o
Revert "stat
_
tr
a
cking
_
info()
:
only count real commits"
commit
|
commitdiff
|
tree
2009-04-21
Michael
J
Gru
b
er
test-lib
.
s
h
:
Help te
s
t_create_repo() find the templ
a
tes dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-21
Junio C Ham
a
no
Merge branch 'm
k
/
m
aint-apply-swap'
commit
|
commitdiff
|
tree
2009-04-21
Junio C Ha
m
ano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-04-21
Ma
r
k
u
s Heide
l
b
erg
grep
:
don't support "grep
.
co
l
or"-lik
e
config op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
M
ike Ralph
s
on
Do
c
u
mentation: fi
x
typos / sp
e
lling mi
s
takes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
M
ik
e
Ralphson
bui
l
tin-r
e
mote: fix typo
in option
descr
i
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Matthieu M
o
y
clone: add test for push
o
n an
e
m
pty clone
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Mic
h
ał Kiedrowic
z
t
e
sts: make te
s
t-a
p
ply-criss-cross-rename more robust
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
M
ichał K
i
edrowicz
builti
n
-app
l
y: keep inf
o
rmation
a
b
o
ut files to be deleted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Micha
ł
Kiedrowicz
test
s
: test applying criss-cross r
e
name p
a
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Frank Lichte
n
held
gitcvs-migration
:
Link to git-cvsimport
d
o
cumentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Joh
a
nne
s
S
c
hinde
l
i
n
Fix off-by
-
one in rea
d
_tr
e
e_re
c
ursive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Johannes Sixt
Windows: Skip fstat/lstat optimization in
wr
i
te_entry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Juni
o
C Hamano
checkout
b
ranch: prime
c
ache-tree
f
u
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
u
n
i
o C Hamano
read-tree -
m
A B: prime cache-tree from the switched
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C Ha
m
ano
Move prime_cache_
t
r
ee() to
c
ach
e
-
tree
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
unio C Ha
m
ano
r
e
a
d-tree A B: do
n
ot corrupt cac
h
e-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Johannes
S
i
x
t
Windows: Work
around intermit
t
ent fail
u
res in mingw_rename
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Ho
l
ger Weiß
g
itweb: Fix s
n
apsho
t
s requested
via
PATH_INF
O
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
J
unio C
H
a
man
o
M
erge
b
ranch
'
m
m/maint-add
-
p
-qui
t
'
commit
|
commitdiff
|
tree
2009-04-20
Wincent
C
olaiuta
git add -p
:
add missing "q
"
to patch
prom
p
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Ju
n
io C
Hamano
Syn
c
with 1
.
6
.
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Junio C H
a
mano
GIT 1
.
6
.
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-20
Ng
u
yễ
n
Th
á
i Ngọc Duy
M
a
kefile:
remove {fetch,send}-p
a
ck from PRO
G
RAMS as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Junio
C Ha
m
a
n
o
Merg
e
br
a
n
ch
'
ef/maint-fast-expor
t
' into maint
commit
|
commitdiff
|
tree
2009-04-19
J
unio C Hamano
Merge b
r
anch 'm
m
/ma
i
n
t-add-p-quit' into
m
a
int
commit
|
commitdiff
|
tree
2009-04-19
J
u
nio C Hamano
Mer
g
e
b
ranch 'lt/maint-reflog-expire' int
o
m
a
int
commit
|
commitdiff
|
tree
2009-04-19
Junio
C
Hamano
Merg
e
br
a
nch 'jc/maint-
s
hared-literall
y
' into ma
i
nt
commit
|
commitdiff
|
tree
2009-04-19
Matthie
u
Moy
Update git-add
.
txt
a
ccording to the new possibilit
i
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Jeff
K
ing
add-
i
nteractive:
refactor mode
hunk handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
M
atthieu Moy
git ad
d
-p: new "q
u
it
"
command a
t
t
he prompt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Junio Hamano
Speed up reflog pruning
of un
r
e
achabl
e
c
o
m
mits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Linus
T
or
v
a
l
ds
Cle
a
n
u
p
reflog
unreacha
b
ility
p
run
i
ng decision
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-Lund
builtin-fast-export
.
c:
handl
e
nes
t
ed tags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
E
r
i
k Fa
y
e-Lund
built
i
n-fast-ex
p
o
rt
.
c:
f
i
x
crash
on tagged tree
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Er
i
k Fay
e
-Lund
bui
l
t
i
n-
f
ast-export
.
c: turn e
r
ror
i
n
t
o warni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-04-19
Erik Faye-Lund
test-sui
t
e: a
d
ding a test for fast-expo
r
t
w
i
th tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next