repo.or.cz
/
git
/
dscho.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
Mat
t
M
cCutchen
git-me
r
g
e
-re
c
u
rsive: honor merge
.
co
n
f
l
ictstyl
e
on
c
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-19
Fredr
i
k Skolmli
Documentation:
S
p
elling
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-19
Jun
i
o C
H
a
man
o
Merg
e
bran
c
h 'pb/rename-rowin32'
commit
|
commitdiff
|
tree
2008-10-18
J
u
nio
C Hamano
Up
d
ate draft release notes for
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-18
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-10-18
Junio C Ham
a
n
o
H
o
pefully the
f
in
a
l
d
raft relea
s
e no
t
e
s update befo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-18
Junio
C Hamano
diff(
1
): clarify what
"
T"ypechange status means
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-18
Juni
o
C Hamano
Merge branch 'db/ma
i
nt-ch
e
c
kout-b
'
into maint
commit
|
commitdiff
|
tree
2008-10-18
Petr
B
aud
i
s
Do not re
n
ame read-onl
y
f
i
les
du
r
ing
a
push
commit
|
commitdiff
|
tree
2008-10-18
Junio
C Hamano
Mer
g
e branch
'
pb/c
o
mmit-whe
r
e'
commit
|
commitdiff
|
tree
2008-10-18
D
an
M
cGee
contrib: update
packinfo
.
pl
to not
u
se dash
e
d commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-18
Bj
ö
r
n Steinbrink
f
o
r
ce_objec
t
_l
o
ose: Fix me
m
ory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-17
J
e
ff
King
test
s
:
s
h
e
ll
n
egatio
n
po
r
tability f
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-17
Junio C Haman
o
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-10-17
Matt McCutch
e
n
t1301-shared-rep
o
.
sh: d
o
n't let a default ACL interfere
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-16
Jonas Fonseca
git-check-attr(1): add
output and exampl
e
se
c
ti
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-16
B
r
ando
n
Casey
xdiff-int
e
rface
.
c: str
i
p newlin
e
(an
d
cr) from li
n
e
.
.
.
commit
|
commitdiff
|
tree
2008-10-16
Brandon Casey
t
4
018-diff-
f
uncname:
d
emonstrate end
of line
funcname
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-16
Brandon
C
asey
t4018
-
diff-funcna
m
e
:
rewor
k
neg
a
t
ed
l
ast expression
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-16
Mikael
Magnusson
Typo "does not exists
"
wh
e
n git re
m
ote
u
pda
t
e re
m
ote
.
commit
|
commitdiff
|
tree
2008-10-15
Brand
o
n C
a
s
e
y
remot
e
.
c: correct the check
f
or a leading
'
/' in a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos V
a
jna
Add te
s
tcase to ensure merging an early par
t
of a branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-14
M
ik
l
os Va
j
na
Add Linu
x
PPC support to
t
he pre-auto-gc
e
xample hook
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-14
Brandon
C
asey
t4018-
d
iff-fu
n
cname: add objective-c xfuncname
p
a
ttern
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-14
J
unio C Haman
o
Up
d
ate draft r
e
lease notes
t
o 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-13
Junio C Hamano
Merg
e
branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-10-13
Junio C Ha
m
ano
Up
d
a
t
e draft release no
t
es to 1
.
6
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-13
Jeff Kin
g
te
s
ts: shell
n
e
g
ation por
t
ability fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-23
Junio C
H
amano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-23
Bran
d
on C
a
sey
builtin-prune
.
c: prune temporary
p
acks in
<object_dir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-23
Brandon Casey
t4018-diff-fu
n
c
n
ame: tes
t
sy
n
tax of bu
i
ltin xfun
c
na
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-23
J
u
nio C
H
amano
Merge
b
ranch 'bc/maint-diff-hunk-header-fix'
i
nto b
c
.
.
.
commit
|
commitdiff
|
tree
2008-09-23
Br
a
nd
o
n Casey
t4018-d
i
ff-func
n
a
m
e
: test syntax of built
i
n x
f
uncna
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-22
Petr B
a
udi
s
D
o not perform cross
-
direct
o
ry
renames w
h
e
n creat
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-22
Junio C H
a
mano
Mer
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-09-22
Todd Zul
l
inge
r
Use
da
s
hless git commands i
n
setgitperms
.
perl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-22
Johannes
S
ixt
git-re
m
o
te:
do n
o
t
us
e
user input in
a
p
r
i
n
tf format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-22
Michael J Gruber
m
a
k
e
"
g
it remote" r
e
port mult
i
ple URLs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-22
De
s
kin Miller
git-svn: do a
p
a
rtial r
e
build if rev_
m
ap is out-of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-22
D
es
k
in Miler
git-svn: testcase
for
p
a
r
ti
a
l
r
e
build
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-22
Junio C Hamano
Merge branch 'db/ma
i
nt-ch
e
ckout-b
'
commit
|
commitdiff
|
tree
2008-09-22
Junio C Ha
m
a
n
o
t5510: test "git f
e
tch" following
t
ags
m
inimally
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-22
Daniel
Ba
r
kalow
Chec
k
e
a
r
l
y th
a
t
a new
bran
c
h
i
s new an
d
valid
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-21
J
u
nio C Hamano
Merge branch '
b
c/maint-
d
iff-hunk-header-
f
ix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-20
Junio C Haman
o
d
i
f
f hunk patte
r
n: fix mi
s
converted "\{"
t
e
x macr
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
J
u
n
i
o C
H
amano
U
p
date d
r
aft release notes
to 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
Junio
C
Hamano
diff: fix
"multiple regexp
"
s
e
mantics to find hunk
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
Junio C
H
amano
di
f
f: us
e
extended re
g
exp to fin
d
hunk
head
e
rs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
J
uni
o
C
Hamano
Merge
b
ranc
h
'bc/
m
aint-diff-hunk-
h
eader-fix'
into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-20
Junio
C Hama
n
o
diff: use ex
t
en
d
ed re
g
e
xp to find
hun
k
headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
Ju
n
io C Hamano
Merge
b
r
a
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-09-20
J
unio
C
Haman
o
Start dr
a
ft r
e
lease notes for 1
.
6
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
Mikael Magnusson
git
-
repack uses --no-repack-ob
j
ec
t
, not
--no-repack
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
Mikael Magn
u
sson
Typ
o
"bogos"
in format-
p
atch error message
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
Fabrizio
C
hiarello
built
i
n-clone: fi
x
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
Yann Dirs
o
n
Bust the
g
h
os
t
of lo
n
g-de
f
unct diffcore-paths
p
ec
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
SZEDER Gábor
bash: use
f
or-each-ref
f
ormat 'refname:
s
hort'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-20
Eric
R
aible
comple
t
i
o
n: git co
m
mit should l
i
st --in
t
eractive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Jun
i
o C Hamano
Merge
b
ranch '
b
c/maint-dif
f
-hunk-heade
r
-fix' into bc
.
.
.
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
M
erge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2008-09-19
Junio C H
a
m
a
no
Mer
g
e br
a
nch
'
jc
/
diff
-
prefi
x
'
commit
|
commitdiff
|
tree
2008-09-19
J
un
i
o C
Hamano
Merge branch
'n
p
/
pack'
commit
|
commitdiff
|
tree
2008-09-19
Jun
i
o
C
Haman
o
Merge branch 'bw/s
h
o
rt
r
ef'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge br
a
nc
h
'rs/decorat
e
'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Haman
o
M
e
rg
e
branch 'tr/r
e
v-list-rever
s
e'
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge
b
ranch 'cc/b
i
sect'
commit
|
commitdiff
|
tree
2008-09-19
J
u
n
i
o C
Hamano
Merge
branch 'jc/setlinebuf-setvbuf'
commit
|
commitdiff
|
tree
2008-09-19
Brandon Casey
diff
.
*
.
xfuncname which uses "exten
d
ed
"
r
e
gex'
s
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
B
r
and
o
n
C
asey
diff
.
c: assoc
i
ate
a
flag wi
t
h
eac
h
pattern
a
nd use
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Brandon
C
a
s
ey
diff
.
c
:
r
e
turn patter
n
e
nt
r
y poin
t
er
r
ather tha
n
j
u
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge branch 'dp
/
maint-rebase-fix'
into maint
commit
|
commitdiff
|
tree
2008-09-19
J
unio C Hamano
M
e
rge branch 'jc/maint-checkout-ke
e
p-remove' into
maint
commit
|
commitdiff
|
tree
2008-09-19
J
unio C Ham
a
no
M
er
g
e
branch 'jc/
m
aint-dif
f
-quiet' into maint
commit
|
commitdiff
|
tree
2008-09-19
Junio C Hamano
Merge bran
c
h 'jc/maint-name
-
hash
-
clear
'
into ma
i
nt
commit
|
commitdiff
|
tree
2008-09-19
Junio C Ha
m
ano
Merg
e
branch 'jc/ma
i
n
t
-template-permbits' in
t
o maint
commit
|
commitdiff
|
tree
2008-09-19
Junio C H
a
mano
M
e
rge br
a
nch 'mh/maint-honor-no-ssl-verify' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2008-09-19
Thomas Rast
sha1_fil
e
:
l
i
nk() returns
-
1 on failure, not errn
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
M
ake git a
r
ch
i
ve respect core
.
autocrlf when creating
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Ad
d
n
ew test
to demonstrate git archive core
.
autocrlf
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Joey Hess
g
itw
e
b:
a
void w
a
rnin
g
s for commits withou
t
bo
d
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Garry Dolley
Clarified
g
itat
t
ributes document
a
tion regar
d
ing custom
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Eric Wo
n
g
git-svn: fix
h
and
l
i
n
g
of even funkier
b
ranch names
commit
|
commitdiff
|
tree
2008-09-19
A
lec Ber
r
yman
git-svn: Always cre
a
te a ne
w
R
A when
call
i
ng d
o
_switch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-19
Alec Be
r
ryman
git-s
v
n
: factor out
s
vnserve test
c
ode
f
or later us
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-18
Junio C
Ham
a
no
diff/diff-fi
l
es: do not use
-
-cc too aggressively
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-16
Ju
n
io C
H
amano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Hamano
Merge branch 'dp/maint-rebase-fix'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Hama
n
o
M
e
rge branch
'jc/maint-ch
e
ckout-keep-remo
v
e'
commit
|
commitdiff
|
tree
2008-09-16
J
uni
o
C
Hamano
Merge
branc
h
'jc/main
t
-
d
iff-q
u
iet'
commit
|
commitdiff
|
tree
2008-09-16
Junio C Ha
m
ano
Merge
b
ran
c
h
'jc/maint-nam
e
-hash-clear'
commit
|
commitdiff
|
tree
2008-09-16
J
u
nio C Hamano
Merge branch
'jc/ma
i
nt-template-p
e
rmbits'
commit
|
commitdiff
|
tree
2008-09-16
Junio C H
a
mano
Merge b
r
anch 'mh/m
a
int-honor-no-ssl-verify'
commit
|
commitdiff
|
tree
2008-09-16
H
e
ikki O
r
sila
Cosmetic
a
l com
m
and name f
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-16
H
eikki Orsil
a
Sta
r
t conforming code
t
o "gi
t
subcmd"
style part 3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-16
Brandon Casey
t97
0
0/t
e
st
.
pl: remov
e
F
ile::Temp re
q
uirement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-16
Brandon C
a
sey
t9700/test
.
pl: avoi
d
bareword
'ST
D
ERR' in 3-arg
u
ment
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-16
Quy
T
ont
h
at
Update RPM spec fo
r
the new location of git-cvs
s
erver
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-13
Juni
o
C
H
amano
Syn
c
with 1
.
6
.
0
.
2
commit
|
commitdiff
|
tree
2008-09-12
Junio
C H
a
mano
GIT 1
.
6
.
0
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-09-12
Junio C Ham
a
no
Merge branch 'ho/maint-d
a
sh
l
ess' into maint
commit
|
commitdiff
|
tree
next