repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'cn/format-patch-quiet' into maint
2011-05-15
Junio C Hamano
Mer
g
e bra
n
ch '
c
n/format
-
patch-quiet' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C H
a
man
o
Merge
b
r
a
nch 'jm/mergetool
-
su
b
modules'
i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
Hamano
M
erge bran
c
h 'jk/for
m
a
t-patch-qu
o
te-special-in-
f
rom
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
git_ope
n
_no
a
tim
e
()
:
drop unu
s
ed parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_fil
e
: typ
o
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nied
e
r
a
dd, merge, dif
f
: do not u
s
e
st
r
c
asecmp to co
m
pare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Prepare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
n
o
Merge
b
ranch 'aw/maint-rebase-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
g
e
branch
'
js/blame-par
s
ename'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
Hamano
Merge branch
'
gr/cvs
i
mport
-
altern
a
tive-cv
s
pass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge
branch
'c
j
/p4mer
g
e' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge
b
ranch 'jk/m
e
r
g
e-one-f
i
le-w
o
rk
i
ng-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merg
e
bra
n
c
h
'jc/fi
x
-
d
iff-fil
e
s-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erg
e
branch 'mz/maint-rename-un
m
e
r
ged' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herland
t5400: Fix a couple o
f
typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jo
ã
o Britto
R
e
m
o
v
e
d
u
p
licated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
an
o
t370
1
: fix here
document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael
J
G
rub
e
r
g
it-fast-import
.
t
x
t: --relati
v
e-marks ta
k
es n
o
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
hell: add missing initialization of argv0_
p
ath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
B
r
ia
n
Gernhardt
t/annotate-tests: Use echo & cat instead o
f
sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branc
h
'jh/dirstat' into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
a
nch 'sp/main
t
-clea
r
-pos
t
fi
e
lds' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge b
r
anch 'jk/maint-stas
h
-oob' i
n
to ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge bra
n
ch
'
jk/mai
n
t-u
p
load
-
p
a
ck-shallow'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
M
erge branch 'dm/stash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge
branch 'j
c
/
p
ack-obje
c
t
s-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Ham
a
no
M
erge branch 'mg/
r
ef
l
o
g
-wi
t
h-optio
n
s' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Hama
n
o
M
e
r
g
e
b
r
anch 'jk/stash
-
loosen-safe
t
y' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
erge branc
h
'ar/cle
a
n-rm
d
ir-empty'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge b
r
anch '
m
g/sha1-pat
h
-advise' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Valentin H
a
enel
g
i
t
-add
.
txt
:
d
o
cument
'
add
.
ign
o
reError
s
'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran
J
essup
Pass empt
y
file to
p
4me
r
ge w
h
e
r
e n
o
base
i
s s
u
itable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Look for password in both CVS and
CVSNT password
files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
r
g
e-o
n
e-file: fix bro
k
e
n merges wi
t
h a
l
ternate wor
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add
te
s
ts for merge-index / merg
e
-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C H
a
mano
Start 1
.
7
.
5
.
1
m
aintenance tra
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
Merg
e
bra
n
ch
'
mg
/
x-years-
1
2
-
months' int
o
maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvai
n
Rabo
t
git-
s
end-
e
mail: fix mis
s
ing space
in error
message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Ston
e
bl
a
m
e: tol
e
rate
b
o
gus
e
-mail addresses
a bit bet
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew
W
ong
git-
r
eba
s
e--interactive
.
sh: preserve-merge
s
fai
l
s on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pr
e
tty:
quote
r
f
c8
2
2 specia
l
s
in email a
d
dre
s
ses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin H
a
e
n
el
git-s
v
n
.
txt:
sm
a
ll typeface i
m
provem
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
t
i
n
H
a
enel
gi
t
-svn
.
txt
:
m
o
v
e
option desc
r
iptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
V
a
le
n
tin Haenel
g
it-svn
.
txt: fix usage of --add
-
au
t
hor-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
unio C Ham
a
no
h
t
tp: c
l
ear POSTF
I
ELDS when
initia
l
izin
g
a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Ha
m
a
n
o
G
i
t 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Ham
a
n
o
diff-fi
l
es: sho
w
unmerged en
t
rie
s
c
orrectl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remov
e
of
t
en unused parame
t
e
r
s f
r
om
d
iff_un
m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c:
return file
p
air from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
t
est
:
u
s
e
$_z40 from tes
t
-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J Gr
u
ber
d
a
te:
a
void "X years, 12 months" in relative dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Hamano
G
it
1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Syn
c
wi
t
h 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
man
o
G
it 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
ha
e
l J Gruber
git-svn
.
txt
:
Document --mergei
n
fo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Ju
n
io C Hamano
Reve
r
t "run
-
comma
n
d: pret
t
ify
-
D_FORTIFY_SOU
R
CE workaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
M
er
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Schar
f
e
archive: document limitation of tar
.
umask
confi
g
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gru
b
e
r
t
3
3
0
6,t530
4
:
a
void cl
o
ck sk
e
w
issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
ael J Gruber
git
.
txt
:
fix li
s
t
c
on
t
inu
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
Hamano
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Merge
branch
'jc/rev-list-opti
o
n
s
-fix' i
n
to
main
t
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch 'js/checkout-untracke
d
-symlink' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
mergetool: Te
a
ch
ab
o
ut submod
u
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ji
m
M
eyering
remove double
d
words,
e
.
g
.
, s/to to/to/
,
and
fix rel
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ram
k
umar Rama
c
handra
r
e
vert: H
i
de '-r'
o
pt
i
o
n
in default
u
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín Nie
t
o
format-p
a
tch: document
-
-
q
uiet op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos
M
artín Nieto
format-pa
t
c
h: don'
t
pass on the --quiet f
l
ag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Her
l
and
--dirstat: In case of renames, use target filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hama
n
o
Merge b
r
anch
'js/che
c
k
o
u
t
-u
n
tr
a
c
k
ed-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Jun
i
o C Hamano
Me
r
ge br
a
nch
'
nd/init-git
d
ir'
commit
|
commitdiff
|
tree
2011-04-12
J
ohann
e
s
S
ixt
t
2021: mark
a
test as fixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
J
o
hannes Sixt
t000
1
: guard a new tes
t
w
ith SYMLINKS prerequi
s
ite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Tea
c
h
-
-dirstat n
o
t to completely ignore rearranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð Bjarma
s
o
n
Mak
e
file:
e
xtract
Q_()
sourc
e
stri
n
gs
a
s
nge
t
t
e
xt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
R
amsay Jones
i18n: avoid parenthesized string a
s
array initializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herl
a
nd
--d
i
rstat-by-file: Make it faster and mor
e
c
orrect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herland
--dirstat
:
Describe
n
on
-
obv
i
ous
differ
e
nces r
e
lativ
e
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
unio C Hamano
Mer
g
e git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Ham
a
no
Merge git:/
/
g
i
t
.
k
ernel
.
org/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
s
tas
h
: ensure
-
-no-
k
eep-index and --pa
t
ch can b
e
used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
D
a
n
McGee
s
tas
h
: add
two
m
ore test
s
for --no-keep-index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
An
d
rew Gar
b
e
r
git-p4: replace e
a
ch ta
b
with 8 space
s
for consist
e
ncy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
eff Ki
n
g
u
pload-pack: start pa
c
k-objects be
f
o
re as
y
nc rev-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git 1
.
7
.
5-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Hamano
Sync with
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
G
i
t 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hama
n
o
Me
r
ge
b
ra
n
ch 'nm/maint-c
o
nflicted-submod
u
le
-
ent
r
ies
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge
branch 'mg/rev-lis
t
-n-re
v
e
rse
-
doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Merge branch 'jk/main
t
-
r
e
m
o
te-mir
r
or-safe
r
'
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
M
er
g
e branch 'mg/do
c
-revisions-txt
'
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
stash: drop dir
t
y workt
r
ee che
c
k o
n
apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach core
.
b
i
gfile
t
hreashold to pack-objec
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seym
o
ur
stash
:
fix false pos
i
tive in the inva
l
id ref
t
est
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
n
g
sta
s
h: fix accidental apply o
f
non-existent stashes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
M
i
c
h
ael J
G
r
uber
r
e
v
i
sions
.
txt: language improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
unio C
H
amano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
next