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
git-merge-recursive: honor merge.conflictstyle once again
2008-10-19
Matt McCutchen
git-me
r
ge-recursive: honor merge
.
c
o
nflictstyle
o
n
ce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-19
Fredrik Sk
o
lmli
Documen
t
ation: Spelli
n
g fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-19
Junio C Hamano
Merge branch '
p
b/renam
e
-row
i
n
3
2
'
commit
|
commitdiff
|
tree
2008-10-18
Juni
o
C Hamano
Update draft rele
a
se notes for
1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-18
Junio C Haman
o
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2008-10-18
Juni
o
C Hamano
Hopefully the
f
inal draft releas
e
notes update before
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-18
Junio C Ham
a
no
diff(1): clarif
y
what "T"
y
pechange st
a
tus m
e
an
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-18
Junio C Ham
a
no
Mer
g
e
b
ranch 'db/maint-checkout-b' in
t
o maint
commit
|
commitdiff
|
tree
2008-10-18
Petr Baudis
Do not ren
a
me rea
d
-only
files durin
g
a
push
commit
|
commitdiff
|
tree
2008-10-18
Junio C Hamano
M
erge bran
c
h 'pb/com
m
it-wh
e
re'
commit
|
commitdiff
|
tree
2008-10-18
Dan McGee
contrib: update
p
ackinfo
.
pl t
o
not use
d
ashed
commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-18
Björn
S
teinbrink
force_obj
e
ct_lo
o
se: Fix me
m
ory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-17
Jeff King
tests: s
h
ell nega
t
ion portabil
i
ty
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-17
Ju
n
io C
H
am
a
no
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-10-17
M
a
tt
M
cCut
c
h
en
t1301
-
shared-
r
epo
.
sh
:
don't let a default
A
CL interfere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-16
Jonas Fo
n
s
eca
git-check
-
attr(1): add
o
utput and
example sections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-16
Brandon Case
y
xdiff-interface
.
c:
str
i
p newline (and c
r
) f
r
om line
.
.
.
commit
|
commitdiff
|
tree
2008-10-16
Brandon
C
asey
t40
1
8-d
i
ff-
f
u
n
cn
a
me: de
m
onstra
t
e
e
n
d of l
i
ne
f
uncname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-16
B
r
ando
n
Casey
t4018-diff-funcname:
r
ew
o
r
k negated last expression
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-16
Mi
k
a
e
l Magnusson
T
yp
o
"
d
oes not exi
s
t
s" w
h
en gi
t
remote update remote
.
commit
|
commitdiff
|
tree
2008-10-15
Brando
n
Casey
remote
.
c: correct th
e
check for a l
e
ading '/' in a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
Vajna
Add testc
a
se to ensure m
e
rging an e
a
rly part
of a branch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Ad
d
Linux PPC s
u
pport
t
o
the pre-auto-gc example
hook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-14
Brando
n
Casey
t4018-diff-funcname: add ob
j
ec
t
ive-c xfuncname pattern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-14
Junio C
Hamano
Update draft
r
el
e
a
s
e n
o
tes to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-13
Junio C Haman
o
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-10-13
Junio C Ham
a
n
o
Up
d
a
te
draf
t
relea
s
e
notes
t
o 1
.
6
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-13
Je
f
f King
tes
t
s:
s
h
ell n
e
g
ation porta
b
ility
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-23
Jun
i
o C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-23
Brandon Casey
builtin-prune
.
c: pru
n
e tem
p
orary packs in <obje
c
t_
d
i
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-23
Bran
d
on Casey
t4018-
d
iff
-
funcname
:
tes
t
sy
n
tax o
f
b
u
iltin
x
funcname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-23
Junio
C Ham
a
no
Merg
e
br
a
nch
'
bc/main
t
-
d
iff-hunk-hea
d
er-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-23
B
r
andon Casey
t401
8
-diff-fu
n
cname:
test
s
yntax of
b
u
iltin xfuncname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Petr Bau
d
is
Do not p
e
r
form
cross-direc
t
o
ry renames when creating
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-22
Todd
Z
ulling
e
r
U
se
da
s
h
less gi
t
co
m
mands in setgit
p
e
r
ms
.
perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Joha
n
nes Sixt
g
i
t-rem
o
te: do not use user input in a prin
t
f format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Mi
c
hael J Gru
b
e
r
make "git remo
t
e" report multiple
URLs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Deskin
Miller
git-svn: d
o
a partial
rebuild if rev
_
map is out-
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
De
s
k
in Mi
l
e
r
g
i
t-svn
:
testcase
f
or partia
l
rebuild
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
J
u
nio C Hamano
Merge branch 'db/maint-checkout-b'
commit
|
commitdiff
|
tree
2008-09-22
J
u
n
io C Hamano
t5510: test "git fetc
h
" followin
g
t
a
gs min
i
ma
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
D
a
niel B
a
rkalow
Chec
k
early that
a new bra
n
ch
is
n
ew and val
i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-21
Jun
i
o C Haman
o
Merge branch
'
bc/maint
-
diff-hunk-
h
e
ader-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-20
Junio C Hama
n
o
diff h
u
nk pattern
:
fix misconverted "\{" tex macr
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Junio C
Haman
o
U
p
da
t
e draft release notes to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Jun
i
o
C H
a
man
o
diff: fix "multiple r
e
ge
x
p" semantics to
find hun
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Junio C Hamano
diff:
use extend
e
d r
e
g
e
xp to find h
u
nk headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Ju
n
io C Ha
m
an
o
Merge bra
n
ch 'b
c
/maint-di
f
f-hunk-header-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-20
Junio C Hamano
d
i
ff: use exte
n
ded regexp to find
h
unk
h
e
aders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Ju
n
io C Hamano
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-09-20
Juni
o
C
Hamano
S
t
art draft rel
e
ase notes
for 1
.
6
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Mikael Ma
g
nusso
n
git-rep
a
ck uses --no
-
repac
k
-o
b
ject, not --no-repack
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Mikael Magnusson
T
ypo "b
o
gos" in format-patch error
mess
a
ge
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Fabr
i
zio
C
hiarell
o
buil
t
i
n
-clone: fix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Yann
Dirson
Bust
t
h
e gho
s
t of long-defunct diffcore-p
a
thspe
c
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
SZEDER Gábor
bash: use for-each-ref f
o
rmat 'refname:short'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Eric R
a
ible
completion:
g
it commit sho
u
l
d
l
is
t
-
-
i
n
teractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Junio C
H
amano
Mer
g
e br
a
nch 'bc/maint-di
f
f
-hunk-header-fix'
into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-19
Junio
C
Hamano
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Ha
m
ano
M
e
rge branch 'jc/diff-prefix'
commit
|
commitdiff
|
tree
2008-09-19
J
u
nio C Hama
n
o
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge
b
ranch 'bw/shor
t
ref'
commit
|
commitdiff
|
tree
2008-09-19
Ju
n
io C
H
amano
M
e
r
g
e br
a
nch 'rs/
d
ecorate'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Me
r
ge
bra
n
ch 't
r
/rev-list-r
e
ver
s
e'
commit
|
commitdiff
|
tree
2008-09-19
J
u
nio C Hamano
Merge bra
n
ch 'cc/bise
c
t
'
commit
|
commitdiff
|
tree
2008-09-19
Jun
i
o
C H
a
m
a
no
Merge
branch 'jc/setlineb
u
f-
s
e
t
v
buf'
commit
|
commitdiff
|
tree
2008-09-19
Brandon
Casey
diff
.
*
.
xfuncname which u
s
es "ext
e
nd
e
d" r
e
g
ex
'
s for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Brandon Casey
diff
.
c: associ
a
te a flag with each p
a
tte
r
n
and use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Brandon
C
a
s
ey
diff
.
c
: ret
u
rn p
a
tter
n
e
ntry pointer rathe
r
than jus
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
J
unio C Hamano
Merge branch 'dp/maint-rebase-fix' into maint
commit
|
commitdiff
|
tree
2008-09-19
J
unio
C
Hamano
Merge branc
h
'jc/maint-checkout
-
keep-rem
o
ve'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
M
er
g
e br
a
nch 'jc/maint
-
diff-quiet' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge
bra
n
ch 'jc/main
t
-name-hash-cle
a
r' into
maint
commit
|
commitdiff
|
tree
2008-09-19
Junio C Ham
a
no
Me
r
ge branc
h
'jc/
m
aint-templ
a
t
e
-permbits'
i
n
to maint
commit
|
commitdiff
|
tree
2008-09-19
Junio
C
H
a
mano
Merge branch 'mh
/
maint-h
o
nor-no-ssl-verify' into
maint
commit
|
commitdiff
|
tree
2008-09-19
Thoma
s
Rast
sha1_file:
link() re
t
urns
-1 on failure
,
n
o
t errno
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arl
e
s Bailey
M
ake
git arc
h
ive respect
co
r
e
.
autocrlf when c
r
eat
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
C
h
ar
l
e
s
Bailey
Add new te
s
t to d
e
monstrate git archi
v
e
c
o
r
e
.
a
u
to
c
rlf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
J
o
ey H
e
ss
gitwe
b
: avoi
d
warnings for co
m
mits
w
ithout body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Garry Dolley
C
lari
f
ied gitattributes document
a
tion regarding custom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Eric Wong
git-
s
vn: fix handling of even
funkier
b
ranc
h
nam
e
s
commit
|
commitdiff
|
tree
2008-09-19
Alec Berryma
n
git
-
svn: Alway
s
create a ne
w
RA when
c
alling do_switch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Alec
Berryman
g
i
t-svn: factor out svnserve test c
o
de f
o
r later use
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-18
Junio C Hamano
diff/diff-files: do not use --cc too ag
g
ressively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
J
u
nio C Hamano
Merg
e
br
a
nc
h
'
m
aint'
commit
|
commitdiff
|
tree
2008-09-16
Jun
i
o C Hamano
Merge bran
c
h '
d
p/maint-reb
a
se-fix'
commit
|
commitdiff
|
tree
2008-09-16
Ju
n
i
o C Ha
m
ano
Mer
g
e bran
c
h
'jc/maint-che
c
kout-keep-remove'
commit
|
commitdiff
|
tree
2008-09-16
Junio C
Hamano
Me
r
ge bra
n
ch 'jc/maint-diff-
q
uiet'
commit
|
commitdiff
|
tree
2008-09-16
Junio C H
a
mano
Merge branch 'jc/maint-name-hash-clear'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Ha
m
ano
Merge branch
'
jc/maint-template-pe
r
m
bits'
commit
|
commitdiff
|
tree
2008-09-16
J
u
nio C
H
amano
Merge bra
n
ch 'mh/mai
n
t-honor-no-
s
sl-verify'
commit
|
commitdiff
|
tree
2008-09-16
Heikki
O
rsila
Cosmetical command na
m
e fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Heikki
O
rsila
Start
con
f
orming code to "git
subcmd"
s
tyle part 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
B
r
andon
C
asey
t
9700/test
.
pl: re
m
ove File::Temp req
u
iremen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Brandon Casey
t
9
700
/
t
e
st
.
pl: avoid bareword 'STDERR
'
in 3-argument
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Quy Tonthat
Updat
e
RPM spe
c
for
t
he new locati
o
n of git-cvs
s
erver
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-13
J
unio
C Hamano
Sync with 1
.
6
.
0
.
2
commit
|
commitdiff
|
tree
2008-09-12
Junio
C Hamano
G
I
T 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-12
Juni
o
C
Ha
m
ano
Merge bran
c
h 'ho/maint-dashl
e
ss' into
m
aint
commit
|
commitdiff
|
tree
next