repo.or.cz
/
git
/
vmiklos.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
M
cCutchen
gi
t
-merge-recursive: honor merg
e
.
confli
c
tstyl
e
once
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-19
Fredrik Skolmli
Do
c
u
mentat
i
on: S
p
elling fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-19
Ju
n
io C Hamano
Merge b
r
anch 'pb/r
e
name-rowin32'
commit
|
commitdiff
|
tree
2008-10-18
J
unio C Hama
n
o
Update draft release notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-18
Ju
n
io C Ham
a
n
o
M
er
g
e branch
'
m
a
in
t
'
commit
|
commitdiff
|
tree
2008-10-18
J
u
nio C Hamano
Hop
e
fully the f
i
nal draft relea
s
e notes update befo
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-18
Ju
n
io C Ham
a
no
diff
(
1): clarify
what "T"
y
pech
a
nge status means
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-18
Junio C Hamano
Merge
b
ranc
h
'
db/maint-che
c
kout-b' into maint
commit
|
commitdiff
|
tree
2008-10-18
Petr Baudis
Do not rename re
a
d
-
only files duri
n
g a push
commit
|
commitdiff
|
tree
2008-10-18
J
u
nio C Ham
a
n
o
Merge
b
r
anch
'
pb/commit-w
h
ere'
commit
|
commitdiff
|
tree
2008-10-18
Dan
M
cGee
cont
r
ib: update packinfo
.
pl to not use dashed
command
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-18
B
jörn Steinbrink
f
o
rce_obj
e
ct_loose: Fix memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-17
Je
f
f King
t
e
sts:
s
h
ell
n
e
ga
t
io
n
portability f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-17
Ju
n
i
o
C Hamano
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2008-10-17
M
att
M
cCutc
h
e
n
t1301-shared-repo
.
sh: don't let a default ACL interfere
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-16
Jona
s
Fonseca
g
it-c
h
eck-attr
(
1): add output
and example sections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-16
Brandon Case
y
xd
i
f
f-interface
.
c: strip newline (and cr) from line
.
.
.
commit
|
commitdiff
|
tree
2008-10-16
Brando
n
Cas
e
y
t4
0
18-d
i
ff-f
u
n
c
name
:
demonstrate en
d
of
line f
u
ncname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-16
Brando
n
Cas
e
y
t40
1
8-diff-func
n
ame: rework neg
a
ted last expression
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-16
Mikael Magnusson
Ty
p
o "does not exists" when git
remo
t
e update remo
t
e
.
commit
|
commitdiff
|
tree
2008-10-15
Brandon Casey
remote
.
c: corr
e
ct the 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 t
e
stcase to ensure mergi
n
g an
early part of a br
a
nch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
aj
n
a
Add
L
inux PPC s
u
p
port
t
o the pre-auto-gc
ex
a
mple
h
ook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-14
Brandon
Case
y
t4018-
d
if
f
-
f
uncname
:
a
d
d
objective-c xfuncname
pat
t
ern
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-14
J
u
nio C Hamano
Update draf
t
release
notes to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-13
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-10-13
Junio C Hamano
U
pdate dr
a
ft rele
a
se notes to 1
.
6
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-13
Jeff
K
ing
tests:
shell neg
a
tion portability fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-23
J
u
nio C Haman
o
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-09-23
Br
a
ndon Casey
builtin-prune
.
c:
prune temporary pack
s
in
<object_dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-23
Br
a
ndon Case
y
t
4018-dif
f
-funcname:
t
est syntax of builtin x
f
un
c
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-23
Ju
n
i
o
C Hama
n
o
Merge b
r
anch 'b
c
/maint
-
diff-hunk-header-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-23
B
r
a
n
don Casey
t40
1
8-diff-funcname: test syntax of bu
i
ltin xfuncname
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Petr Baudis
D
o
n
ot perform cross-direc
t
o
ry renames wh
e
n creati
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Junio C Hamano
Me
r
ge br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-09-22
Tod
d
Zullinger
Use dashless git commands i
n
set
g
i
tpe
r
ms
.
perl
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Johannes Sixt
git-rem
o
te: do
not use user input in a pri
n
tf format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Michael J
G
ruber
make "git remote" rep
o
rt mu
l
tiple URLs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
Deskin Mi
l
le
r
git-svn:
d
o
a
p
art
i
a
l
rebuild if rev_map is o
u
t-o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
De
s
kin Miler
git-svn: testcase for p
a
rtial
rebu
i
ld
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
J
u
n
io C
H
amano
M
e
r
ge bra
n
ch 'db/mai
n
t
-
ch
e
ckout-b'
commit
|
commitdiff
|
tree
2008-09-22
Juni
o
C Ha
m
a
n
o
t5
5
10: test "git
fetch" f
o
llowing tags
minima
l
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-22
D
a
n
iel Barkalow
Check
early that a new b
r
anch is new and valid
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-21
Junio C Hamano
M
e
rge branch 'bc/maint
-
di
f
f-hunk-h
e
ader-fix
'
into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-20
Junio C
Ham
a
n
o
diff hu
n
k pattern: fix mis
c
onve
r
ted "\{" tex m
a
c
r
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Junio C Hamano
Updat
e
draft release notes to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Junio
C
Hamano
di
f
f
: fix "m
u
ltiple regexp" seman
t
ics to fi
n
d hunk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Junio C H
a
mano
diff: use extended
regexp to
f
i
n
d
hunk heade
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Juni
o
C
H
aman
o
M
e
r
g
e
branch 'bc/m
a
i
n
t-diff-h
u
nk-header-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-20
Jun
i
o C Hamano
diff: u
s
e extended reg
e
xp to f
i
nd hunk h
e
aders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-20
J
u
n
i
o
C
Ham
a
no
Start
draft release note
s
f
o
r 1
.
6
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Mikael Magnusson
git-re
p
ack uses --no-repa
c
k-object, not
-
-n
o
-repa
c
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
M
i
kael M
a
gnuss
o
n
Typo "bo
g
os"
in format-patch
e
rror me
s
sage
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
F
a
brizio Chiar
e
llo
b
u
i
l
tin-clone:
f
ix typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Yann
D
i
rson
B
u
st th
e
ghost of lo
n
g-defunct diffcore
-
pathspe
c
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
SZEDER Gábo
r
bash: use for
-
each-ref format 'refna
m
e
:short'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-20
Eric Raible
complet
i
on: git commit sh
o
uld
l
ist --interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Juni
o
C Hamano
Merge branc
h
'
b
c/mai
n
t-diff-hunk-hea
d
er-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-19
Junio C Ha
m
an
o
Me
r
g
e
bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-09-19
J
u
ni
o
C
H
amano
M
e
rge branch 'jc/diff
-
prefix'
commit
|
commitdiff
|
tree
2008-09-19
Jun
i
o C H
a
mano
Merg
e
branch '
n
p/pack'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge bran
c
h
'
bw/
s
hortref'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merg
e
branch 'rs/decorate'
commit
|
commitdiff
|
tree
2008-09-19
J
u
nio
C Hamano
Merge
bran
c
h 'tr/rev-list-re
v
er
s
e'
commit
|
commitdiff
|
tree
2008-09-19
Junio
C
Haman
o
Merge
branch 'c
c
/b
i
se
c
t
'
commit
|
commitdiff
|
tree
2008-09-19
Junio C H
a
man
o
Merge b
r
anch 'jc/
s
etlinebuf-setv
b
uf'
commit
|
commitdiff
|
tree
2008-09-19
Brandon Casey
di
f
f
.
*
.
xfuncname which uses "exte
n
d
e
d" regex's for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Bra
n
don Ca
s
ey
diff
.
c: associate a flag with e
a
ch p
a
ttern and use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Brandon Casey
diff
.
c: re
t
u
rn patter
n
e
nt
r
y pointe
r
rather than just
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Junio
C
Hamano
M
e
rge branch
'
dp/
m
aint-reba
s
e-
f
ix' into maint
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge branch 'jc/ma
i
nt-checkout-keep-re
m
ove'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2008-09-19
Junio C
H
amano
M
e
r
ge bra
n
ch 'jc/maint-diff-quiet' i
n
to
maint
commit
|
commitdiff
|
tree
2008-09-19
Jun
i
o C Ha
m
an
o
Mer
g
e branch 'jc/maint-name-
h
ash-
c
l
e
a
r' into maint
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
M
e
rge branc
h
'jc/maint-t
e
m
p
late-perm
b
it
s
'
i
nto maint
commit
|
commitdiff
|
tree
2008-09-19
Junio
C
Hamano
Merge branch 'mh/maint-honor-no-ssl-ver
i
fy' into maint
commit
|
commitdiff
|
tree
2008-09-19
Thoma
s
Rast
sha1_file: link() returns -1 on failu
r
e,
n
ot errno
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
B
a
i
ley
Make git
a
rchive
res
p
ect core
.
aut
o
crlf when
c
reating
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
l
es
B
a
iley
Add new tes
t
to demonstr
a
t
e
git archive core
.
auto
c
rlf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
J
oey Hess
gitweb: av
o
id warning
s
for commits without body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Garr
y
Dolley
Clarif
i
ed gitattributes documentation rega
r
di
n
g custom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-19
Eric Wong
git
-
svn: fix
h
andling o
f
e
v
en fun
k
i
e
r
branch name
s
commit
|
commitdiff
|
tree
2008-09-19
Alec Berry
m
an
g
i
t-sv
n
: Alwa
y
s
c
reate
a new RA
when cal
l
ing 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 te
s
t code for
later use
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-18
Junio C Hamano
diff/diff-files:
d
o not use --cc too aggressively
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Junio C Hama
n
o
Mer
g
e
b
r
a
nch 'm
a
int'
commit
|
commitdiff
|
tree
2008-09-16
J
u
n
io C Hamano
Merge bran
c
h 'dp/maint-reb
a
se-fix'
commit
|
commitdiff
|
tree
2008-09-16
J
unio C
Hamano
Mer
g
e branch 'jc
/
maint-c
h
eckout-k
e
ep-re
m
ov
e
'
commit
|
commitdiff
|
tree
2008-09-16
Junio C
H
am
a
no
Me
r
ge branch 'jc/maint-
d
iff-quiet'
commit
|
commitdiff
|
tree
2008-09-16
Junio C
H
amano
Merge
b
ranch 'jc
/
maint-name-has
h
-c
l
ear'
commit
|
commitdiff
|
tree
2008-09-16
Juni
o
C Hamano
Me
r
ge branch 'jc/
m
aint-tem
p
late-
p
ermbits'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Hamano
M
e
rge branch
'
mh/maint-honor-no-
s
sl-verify'
commit
|
commitdiff
|
tree
2008-09-16
H
eikki Orsila
Cosmetical comm
a
nd n
a
me f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Heikk
i
Orsila
Start confor
m
in
g
code
t
o "git
s
ubcmd" style part 3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Brandon Cas
e
y
t9
7
00/test
.
pl: remove File::T
e
mp requirement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Brando
n
C
a
sey
t970
0
/test
.
pl: avoid bar
e
word 'ST
D
ERR' in
3-argument
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-16
Quy
T
ont
h
at
Update RPM spec
f
or th
e
new
l
ocation of gi
t
-cvss
e
r
ver
.
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 Ha
m
ano
GIT 1
.
6
.
0
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-09-12
Ju
n
io C Hamano
Merge br
a
nch 'ho
/
maint-dash
l
ess'
i
n
to
ma
i
n
t
commit
|
commitdiff
|
tree
next