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
Merge branch 'cn/
f
ormat
-
p
atch-quiet' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
J
uni
o
C Hamano
M
e
rge
branc
h
'
j
m/mergetool-submod
u
le
s
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
ano
M
e
r
ge
b
ranch
'jk/fo
r
m
a
t-patch-quote-special-in
-
from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e branch 'vh/
g
it-svn-doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
git_open
_
noati
m
e():
dro
p
unused
p
aramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
an
o
sha1_file: typ
o
fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
o
nathan Nie
d
er
add, merge, di
f
f
:
do no
t
use strcasecmp to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
Haman
o
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Haman
o
Merge branch 'aw/maint-rebase
-
i-
p
-no-f
f
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
Merg
e
branch 'js/bla
m
e-pa
r
sename' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
Hamano
Mer
g
e branch
'gr/c
v
s
import-altern
a
tive-cvs
p
ass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge bran
c
h
'cj
/
p4merge' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge b
r
a
nch 'jk/merge-one-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
aman
o
Merge br
a
nch 'jc/fix-di
f
f-files-unmerged
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
a
m
a
no
M
erge branch 'mz/maint-rename-unmerged' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Johan
Herl
a
nd
t540
0
: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Remove dupli
c
a
te
d
"
is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t
3
701: fix
here docu
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
ichae
l
J
Gruber
git-
f
ast-import
.
txt: --relative-marks takes no par
a
m
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell:
a
dd
mi
s
sing
initializat
i
o
n of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/
a
nnota
t
e-test
s
: Use echo & cat inste
a
d 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
J
unio C H
a
mano
M
erge branc
h
'jh/
d
irstat' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
am
a
no
Merge
b
ranch 's
p
/maint-cle
a
r-post
f
ields
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Me
r
ge branc
h
'j
k
/maint-st
a
sh-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C H
a
mano
Merge
b
ranc
h
'jk/maint-upload-pack-sh
a
llow' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Hamano
Me
r
ge b
r
anch 'dm/sta
s
h-k
-
i-p
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Me
r
ge bra
n
c
h
'jc/p
a
ck
-
objects-bigfile' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
amano
Merge bra
n
c
h
'mg/r
e
flo
g
-with-op
t
ions' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Me
r
ge branch 'jk/stash-l
o
osen-safety' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ham
a
n
o
Merge br
a
nch 'ar/cl
e
an-rmdir-emp
t
y' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'mg/sh
a
1-path-advise'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
V
al
e
ntin
H
aenel
git-ad
d
.
txt: docume
n
t 'add
.
ign
o
reErro
r
s'
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
an Jessup
Pas
s
emp
t
y f
i
le to p4merge
wher
e
n
o
b
ase i
s
suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy
R
oui
l
lie
r
L
ook for
p
assw
o
rd in both C
V
S and
CVSNT password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
King
me
r
ge-one-file: f
i
x broken merg
e
s with alternate
work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
add
t
ests fo
r
merge-index / merge
-
one
-
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Star
t
1
.
7
.
5
.
1 m
a
intenance tra
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge
bran
c
h
'
mg/x-y
e
a
r
s-12-months'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-email: fi
x
missing space in
e
rror
m
e
ssa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh St
o
ne
blame: to
l
erate bogus e-ma
i
l
add
r
e
s
ses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
A
ndre
w
W
ong
git-reba
s
e--in
t
eractiv
e
.
sh: preserve-
m
erges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pr
e
tty: quote rfc
8
22 spec
i
a
ls in em
a
il
a
ddre
s
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
al
e
ntin Haenel
git-svn
.
txt:
s
mall ty
p
efac
e
improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: move option
d
escriptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin
H
aene
l
git
-
svn
.
txt:
fix usage of --add-author-f
r
om
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
Ha
m
ano
http: clear POSTFIELDS when i
n
itializi
n
g
a
slo
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
diff-file
s
: show unmerged entries
c
orrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
diff: rem
o
ve often
u
n
used para
m
eters from diff
_
u
nme
r
ge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff
.
c: re
t
urn
filepair from di
f
f_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
a
mano
test: use $_z40
from te
s
t-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
d
ate
:
a
voi
d
"X years, 12 months" in relative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C
Hamano
Git 1
.
7
.
5
-
r
c
3
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
Junio C
H
am
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
g
it-s
v
n
.
tx
t
: Document -
-
mergein
f
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
u
nio C
H
am
a
n
o
Reve
r
t "run-command: prett
i
fy -
D
_FORTIFY_SO
U
RCE
w
o
rkaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
a
man
o
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharf
e
a
rchive: document lim
i
tat
i
on o
f
tar
.
umask config setti
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael J Grube
r
t3306,t5304
:
avo
i
d
clock skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gru
b
e
r
git
.
txt:
fix list continuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
Gi
t
1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
ni
o
C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C
Hama
n
o
Merge branch 'jc
/
r
ev-list-o
p
tion
s
-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
a
mano
Merge branch 'js/checkout-
u
ntracked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
mergetool: Teach about submod
u
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Me
y
e
r
ing
remove doubled w
o
rds
,
e
.
g
.
,
s
/to to/to/
,
and
f
ix r
e
lated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkuma
r
Ramac
h
andra
reve
r
t: Hide '-r'
o
ption in default usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos
M
art
í
n Nieto
f
o
r
m
at-pat
c
h: document --quiet
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Martín Niet
o
format-patch: don
'
t pas
s
o
n
th
e
--
q
uiet
flag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: In case of
rename
s
, use target
f
ilename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branch
'js/checkout-untra
c
ked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branc
h
'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes
S
ixt
t2021: m
a
r
k
a test
a
s
fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johanne
s
Sixt
t0001: guard a new te
s
t with SYMLINKS prereq
u
isite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han
Herland
Te
a
ch --dirstat n
o
t to co
m
pletely ignore rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Ar
n
fjörð
B
j
a
rmason
Makefile:
e
xtra
c
t Q_(
)
source str
i
ngs as
ng
e
ttext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i
18
n
:
avoid
par
e
n
th
e
s
i
zed
string as arr
a
y
i
nitializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irstat-by-file: Make it faster
a
n
d more correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
--di
r
stat: Descri
b
e non-ob
v
i
ous d
i
fferences relative
.
.
.
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 Ham
a
no
Mer
g
e git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio
C H
a
m
ano
Merge git://git
.
kernel
.
o
r
g/pub/scm/g
i
tk/git
k
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash
:
ensure --no-kee
p
-index a
n
d --patch can be u
s
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan M
c
Gee
stash: a
d
d two mor
e
tests
for --no-keep-i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew
G
arber
git-p4:
re
p
lace each
tab with 8 sp
a
ces for
c
ons
i
stency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-pack: start pack-objects before
a
s
y
n
c
rev-l
i
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
un
i
o 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
J
u
nio C H
a
ma
n
o
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Hamano
Merge branch
'
nm/main
t
-conflicted
-
submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
M
e
r
ge branch
'
mg
/
rev-list-n-reverse-doc' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Hamano
Merge branch 'jk/main
t
-remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Hamano
Mer
g
e
branch 'mg/doc-revisions-txt'
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
stash: drop dirty worktree c
h
eck
on app
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
a
mano
Teach c
o
re
.
b
igfileth
r
eashold t
o
pack-objec
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
s
t
a
sh: fix
fa
l
se pos
i
tive
i
n
t
he in
v
a
l
i
d
ref
te
s
t
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f Ki
n
g
sta
s
h: fix accidental ap
p
ly of non-
e
xistent st
a
shes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Michae
l
J Gruber
r
e
visions
.
txt: language
i
mpro
v
e
m
ents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C H
a
ma
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
next