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 'jk/format-patch-quote-special-in-from' into maint
2011-05-15
Junio
C
Hamano
Merge branch 'jk/
f
o
rmat
-
patch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
Merge br
a
nch 'vh/git-sv
n
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
g
i
t_open_noatime():
d
rop unus
e
d
parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1
_
file: ty
p
of
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Niede
r
add, m
e
rge, diff:
d
o not use strcasecmp t
o
c
o
mpare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
branch
'
aw/m
a
int-rebase-i-p-no-ff
'
in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Mer
g
e branch 'j
s
/blame-parsename' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge branch 'gr/cvs
i
mport-alter
n
ative-cvs
p
ass-
l
o
c
ation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
mano
Merge branc
h
'cj/p4mer
g
e' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge bran
c
h 'jk/merge-o
n
e
-fil
e
-workin
g
-
t
ree
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ham
a
no
Merge branch 'jc/
f
ix-
d
i
ff-files-u
n
merged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge bra
n
ch 'mz
/
mai
n
t-ren
a
me-unme
r
ge
d
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
e
r
la
n
d
t5400: Fix a coupl
e
of
typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Bri
t
to
Remove dup
l
ica
t
ed "
i
s a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
unio
C
Ha
m
a
no
t
3701:
fix
h
ere document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-fast-impo
r
t
.
txt: --relati
v
e-marks takes
n
o paramete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Sharov
shell:
a
dd missing initialization of arg
v
0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
r
ian Gernhardt
t/annotate-t
e
sts
:
Use echo
& cat instead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hama
n
o
Merge branch 'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge
branch 'sp/maint-clear
-
p
o
stfields' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C H
a
mano
Me
r
ge
b
r
anch
'jk/maint-stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branc
h
'
j
k/maint-upload-pack-shallow' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C Hama
n
o
Merge bra
n
ch
'
dm/st
a
sh-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge br
a
nch 'jc/
p
a
ck-objects-b
i
gfile' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
aman
o
Merge b
r
anch '
m
g/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge br
a
nch 'jk/stas
h
-loo
s
en-safety'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Haman
o
Merge branch 'ar/clean-rmd
i
r-em
p
ty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge
branch 'm
g
/
s
h
a1
-
path-advi
s
e' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Val
e
n
t
i
n Haenel
git-add
.
t
xt:
d
oc
u
ment 'add
.
igno
r
eErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciar
a
n Jessup
Pass empty file to p4merge
where no ba
s
e
i
s suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Gu
y
Rou
i
llier
Look
f
or pa
s
sword in
both CVS
a
nd CVS
N
T
password fil
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
eff King
m
e
rge-o
n
e
-
f
i
le: fix broke
n
m
erges w
i
th
a
lte
r
n
a
te work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add
tests for mer
g
e-inde
x
/
m
erge
-
on
e
-
f
i
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C
Hamano
S
t
art
1
.
7
.
5
.
1 mainten
a
nce track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
mano
M
erge bran
c
h 'mg/x-years-12-months
'
into main
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-s
e
nd
-
email:
f
ix missing space in error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh
Stone
blame: to
l
erate bogu
s
e-mail addresses a bit
b
et
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
A
ndrew Wong
git-rebase--interactive
.
sh:
p
reser
v
e-merges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: quote rf
c
822 specials in email ad
d
resses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Va
l
e
ntin
H
aenel
g
i
t
-svn
.
tx
t
: sm
a
ll typeface improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haenel
git-svn
.
tx
t
: move option descriptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
g
i
t-svn
.
txt: fix usage of --add-author-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C Hamano
http: clear POSTF
I
ELDS
w
hen initializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C
Ha
m
ano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
d
i
ff-fil
e
s:
s
how un
m
e
r
ged entrie
s
correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
H
amano
di
f
f
:
remove often unused parame
t
ers from
diff_
u
n
merg
e
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
di
f
f
.
c:
r
eturn filepair from d
i
ff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
a
man
o
t
est: use
$_z40 fr
o
m t
e
st-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Mich
a
el
J
G
ru
b
er
date:
avoid "X yea
r
s,
1
2 mont
h
s" in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
amano
Git
1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o
C
Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
M
i
chael J Gruber
gi
t
-svn
.
t
x
t
:
Docum
e
nt --
m
ergeinf
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
u
n
io C Hamano
R
e
vert "run-co
m
mand: prettify -D_FORTIFY_SOURCE wor
k
a
r
ound
"
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
R
ené Scharf
e
a
r
chive: documen
t
limitati
o
n of tar
.
um
a
sk con
f
ig s
e
tting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
ael J Gru
b
er
t3306,t5304: avoid clock sk
e
w issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
a
el
J Gruber
git
.
t
xt: fix list continuation
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
J
u
nio
C
H
a
man
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
Merge b
r
anc
h
'jc/rev-li
s
t
-optio
n
s-fix'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Haman
o
Me
r
ge branch 'js/checkout-untracke
d
-symlink' into main
t
commit
|
commitdiff
|
tree
2011-04-13
J
im Me
y
ering
r
e
move double
d
w
o
rd
s
, e
.
g
.
, s/to to/to/,
and fi
x
related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ra
m
kumar
Ramachan
d
ra
revert: Hid
e
'-r' option i
n
default usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
oh
a
n
H
e
r
land
--dirstat: In case of renames, use t
a
rget filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Jun
i
o C Ha
m
ano
Merg
e
b
ranch 'j
s
/checkout-u
n
tracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Juni
o
C
Hamano
Merge branch '
n
d/init-git
d
ir
'
commit
|
commitdiff
|
tree
2011-04-12
Johannes Si
x
t
t2021: m
a
r
k a t
e
st
a
s fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
o
hanne
s
S
i
xt
t
0
0
0
1
:
g
u
ard
a
new test
with
SYMLIN
K
S pre
r
equisite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
h
an Herl
a
nd
T
e
a
c
h --dirstat n
o
t to complet
e
ly ignore
r
ea
r
ranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð Bjar
m
ason
Makefile: extract Q_
(
) sour
c
e stri
n
g
s as ngettext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay J
o
n
es
i
1
8n: avoid parenthe
s
i
zed string
a
s array initializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--d
i
rstat-by-fil
e
: Make
i
t fas
t
e
r and more correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
-
-
d
irstat: Describe
non-obvious differences relativ
e
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Junio C
Hamano
Merge g
i
t://git
.
bogomips
.
or
g
/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C
H
a
mano
Merge git
:
//
g
it
.
k
erne
l
.
org
/
pub/
s
cm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan McG
e
e
stash: en
s
u
r
e --no-kee
p
-index
and --patch can be used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan M
c
Gee
stash: add
t
wo more tests for --no-keep
-
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
git-p4: replace each tab with 8
s
paces for consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
ng
u
p
load-p
a
ck: star
t
pack-objects before async rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
G
i
t
1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
S
ync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
J
unio
C
Hamano
G
it 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Ham
a
no
Merge
b
ranch 'nm/maint-conflicted-sub
m
o
d
ule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
Merge b
r
anch 'mg/rev-li
s
t
-n-reverse-doc
'
into
m
a
int
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branc
h
'jk
/
main
t
-rem
o
te-
m
irr
o
r-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
Merge branch
'
mg/
d
oc-
r
evisions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f King
stash
:
drop dirty
worktree check on ap
p
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach core
.
bigfi
l
e
t
hreash
o
ld to pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
s
tash: fi
x
false posi
t
ive in
the invalid ref test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: fix a
c
cident
a
l ap
p
ly of
non-existent stashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Michael J Gruber
r
e
vi
s
i
o
ns
.
tx
t
: language improv
e
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ha
m
ano
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C Hamano
Me
r
ge bra
n
c
h 'jl
/
submodule-
f
etch-on-
d
emand'
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C
H
am
a
no
Merge branch 'jc/rev-list-options-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER Gáb
o
r
Do
c
umentation: trivi
a
l gram
m
ar fi
x
in core
.
wo
r
ktre
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jaku
b
Narebski
gitweb: F
i
x pa
r
sing o
f
negat
i
ve fractional timezones
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio
C Ha
m
ano
Merge bra
n
ch 'nm/maint-confli
c
ted-
s
ubmo
d
ule-en
t
ries'
commit
|
commitdiff
|
tree
next