repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/maint-add-p-overlapping-hunks' into maint
2011-05-16
Jun
i
o C Haman
o
M
e
r
g
e branc
h
'
j
c
/maint-
a
dd-p-overlapp
i
ng
-
hunks
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
i
m
Me
y
ering
Documentation/git-f
s
ck
.
txt: fix typo:
u
nreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Upd
a
t
e
draft releas
e
notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
M
e
rge
b
ranch 'cn/format-patch-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
M
e
rge
b
ranch
'
jm/mergetool-subm
o
dules' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
b
ranch
'jk
/
format-patch-quot
e
-spe
c
ial-i
n
-
fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
b
ranch
'
vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
git_open_noatim
e
()
:
drop unu
s
e
d
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o C Ha
m
ano
sha1_fil
e
:
t
y
p
ofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
onat
h
an Nied
e
r
add,
mer
g
e, diff: do not use
strcasecmp to
c
ompare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
P
repare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
nch 'aw/maint-rebase-i-p-
n
o-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge bra
n
ch 'j
s
/
blame-parsename' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'gr/
c
vsimport-alternat
i
ve-cv
s
pass-lo
c
a
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branch 'cj/p4merg
e
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
M
e
rge b
r
anch 'jk/merg
e
-on
e
-file-working-tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'jc/fix-
d
iff-files-unmer
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
e
rge branch 'mz/maint-re
n
ame-unme
r
ged'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5
4
00: Fix a
couple of
t
ypos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Juni
o
C Hamano
t
3
701: a
d
d-p-f
i
x
makes the last test
to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Re
m
o
ve duplic
a
t
e
d "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio C Hamano
t3701: fix
here docume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael J Gru
b
er
gi
t
-fast-import
.
txt: --rela
t
ive-mark
s
t
akes no parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima
S
harov
shell: add missin
g
i
n
it
i
alization of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Ger
n
hardt
t/ann
o
t
ate-
t
ests: Use echo & c
a
t instead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
G
i
t 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
a
m
ano
Mer
g
e branch 'jh/di
r
stat
'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'sp/maint
-
c
lear-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch 'jk/m
a
i
n
t-stash-oob'
i
nto
m
ain
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
M
e
r
ge
branch 'jk/maint-upload-pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
no
Me
r
ge bran
c
h 'dm/stash-k-i-p' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e
b
ranch '
j
c/pa
c
k-obje
c
ts-big
f
ile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge
b
ranc
h
'mg/r
e
flo
g
-
with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Mer
g
e bran
c
h 'jk/stash
-
loosen
-
safet
y
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge b
r
anc
h
'ar/clean-rmdir-
e
mp
t
y' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
er
g
e
br
a
nch 'mg/s
h
a1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin H
a
enel
g
i
t-add
.
tx
t
: d
o
cume
n
t
'
a
dd
.
ignoreErr
o
rs'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Cia
r
a
n Jessup
Pass empty file to p4merge where
no b
a
se
is suita
b
le
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look fo
r
p
a
ssword in bo
t
h CVS and
C
VSNT passwor
d
fil
e
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
rge-one-
f
i
le: fix b
r
oken m
e
rges
w
ith
a
lternate w
o
rk
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
a
d
d tests for merge-index / merge-one-
f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
"add -p
"
: work-arou
n
d an old laziness that do
e
s not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
add
-
-int
e
r
activ
e
.
perl:
f
actor o
u
t
r
epea
t
e
d --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
t3
7
01:
Editing a split
h
unk
i
n
an "add
-
p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io
C Hamano
a
d
d
-p: 'q' should really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
S
t
art 1
.
7
.
5
.
1 mainten
a
nce
t
r
ac
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
M
er
g
e
b
ranc
h
'mg/x-years-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git
-
s
e
nd
-
email: fix
m
issing
space in e
r
ror mes
s
a
g
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame:
t
olerate
b
ogus
e
-
mail addresses a bit bet
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
And
r
e
w Wong
g
i
t-reb
a
se--i
n
t
e
r
ac
t
ive
.
s
h: preserve-merges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff K
i
n
g
pretty: quote
rfc822 spe
c
ials in email addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
n
tin Ha
e
n
e
l
git-s
v
n
.
txt
:
s
mall typeface
i
m
p
rove
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Ha
e
nel
gi
t
-svn
.
txt: move option descriptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin Haenel
git-svn
.
txt:
f
ix
u
sage of
-
-add
-
author-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C
H
ama
n
o
htt
p
: clear POSTFIELDS when initia
l
izing a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
G
i
t
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-file
s
: show unm
e
r
g
e
d entries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
ni
o
C Hamano
dif
f
:
r
emove often un
u
s
ed para
m
eters fr
o
m d
i
f
f_unm
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
diff
.
c
: retu
r
n filepai
r
fro
m
diff_unm
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
t
e
st: use
$
_
z
4
0
fr
o
m test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael J G
r
uber
dat
e
: avoid "
X
years, 12 mon
t
hs" in r
e
lative dat
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git 1
.
7
.
5
-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ham
a
no
S
y
nc with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Ham
a
no
Git
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git-svn
.
t
xt: Documen
t
--mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
u
nio C Hamano
Revert "run-com
m
and: pret
t
ify -D_FOR
T
IFY_S
O
URCE workaround
"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Haman
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-04-14
Ren
é
Scharfe
archive: doc
u
ment
li
m
itat
i
o
n
of tar
.
u
m
ask config s
e
tting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306,t5
3
04:
avoid
c
lock
sk
e
w issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael J
G
ruber
g
i
t
.
txt: fix list c
o
ntin
u
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
G
i
t
1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Ha
m
an
o
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge
bran
c
h 'j
c
/
rev-
l
ist-opti
o
ns-fi
x
' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
un
i
o C Hamano
Merge branch 'js/checkout-
u
n
t
ra
c
ked-symlink
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-04-13
Jo
n
athon Mah
mergeto
o
l: T
e
a
ch about submodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jim Mey
e
rin
g
remove
d
oub
l
ed words, e
.
g
.
, s/to to/t
o
/, an
d
f
i
x related
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachandra
re
v
er
t
: H
i
de '-r' option in de
f
ault usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
C
arlo
s
Martín Nieto
format-
p
a
t
c
h:
d
oc
u
m
e
nt --quie
t
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín
Ni
e
t
o
format-patch: don't pass
o
n
the --quie
t
flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
-
-dirstat: In c
a
s
e of renames, u
s
e target filena
m
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio C
Hamano
Merge b
r
a
n
c
h
'js/che
c
kout-
u
n
t
racked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hama
n
o
Merge bran
c
h 'nd/in
i
t-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
J
oh
a
nnes Sixt
t20
2
1:
m
ark
a
test as fixe
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johannes
Sixt
t0001:
g
uard
a
ne
w
test with SYMLIN
K
S prerequi
s
ite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
Teach --dirstat not to com
p
l
etely
i
g
n
ore r
e
arranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Æva
r
Arnf
j
ör
ð
Bja
r
mason
Makef
i
l
e: extract Q_() source strings as ng
e
tte
x
t(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n:
avoi
d
parenthesized st
r
ing as array in
i
t
ializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--dirstat-by-file:
M
ake it faster an
d
more
co
r
r
e
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Des
c
r
ibe non-obviou
s
diff
e
rences relative
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ju
n
i
o C Hamano
Merge git://git
.
bogom
i
ps
.
o
r
g/git-
s
vn
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
Hama
n
o
Mer
g
e git
:
//git
.
kernel
.
org/pub/scm/
g
itk/gi
t
k
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stas
h
:
ensure --
n
o-keep
-
in
d
ex and -
-
p
a
tc
h
c
an be us
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
D
a
n McGee
stash: a
d
d two more test
s
fo
r
--no-keep-index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andr
e
w
Ga
r
ber
git-p4: rep
l
ace each tab with 8 sp
a
ces for
c
onsistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
eff Ki
n
g
upl
o
ad-pa
c
k: start pack-objects
b
efo
r
e as
y
nc
r
e
v-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
io C Hamano
Git 1
.
7
.
5-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Ham
a
no
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
aman
o
Git 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
unio
C
Hamano
Me
r
g
e
b
r
anch
'
nm
/
maint-conflicted-
s
u
b
m
o
dule-entrie
s
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Ha
m
ano
Merge branch 'mg/rev-
l
ist-
n
-rever
s
e-doc' into
maint
commit
|
commitdiff
|
tree
next