repo.or.cz
/
git
/
mjg.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
M
erge branch 'cn/format-patch-quiet
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Merge branch 'jm/mergetool-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
b
ranch '
j
k/format-
p
atc
h
-quo
t
e-special-i
n
-
from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
M
erge branch 'vh/gi
t
-
s
vn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C H
a
m
a
no
git_open_noatim
e
(): drop unuse
d
paramet
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
sha1_fi
l
e
:
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonat
h
an N
i
ed
e
r
add, merge, d
i
ff: d
o
no
t
use
st
r
casecmp to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Prep
a
re for
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C Ham
a
no
Merge bran
c
h
'aw/maint-rebase-
i
-p
-
n
o
-
ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o C H
a
mano
M
erg
e
branch
'j
s
/
blame-parsename'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'gr/
c
vsimport-alternative-cv
s
pass-loca
t
io
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ham
a
no
Merge branch
'
cj/p4merge
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-o
n
e
-
file-working-
t
ree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ham
a
no
Merge br
a
n
c
h 'jc/fi
x
-di
f
f
-files-unm
e
rge
d
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hama
n
o
M
erge bra
n
ch 'mz/maint-rename-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n
Her
l
a
n
d
t5400: Fix a couple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Joã
o
Britto
Rem
o
v
e
d
uplic
a
te
d
"is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C
H
amano
t3701: fi
x
here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
gi
t
-
f
a
st-import
.
txt: --relative-marks tak
e
s no
p
a
ramet
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
D
i
ma Sharov
s
h
ell: add missing ini
t
ia
l
ization of
argv0_p
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian
G
e
r
n
hardt
t/annotate
-
tests
:
U
s
e ec
h
o
& cat inste
a
d of
s
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C H
a
m
a
no
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branc
h
'jh/d
i
rstat'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
ni
o
C Hamano
Mer
g
e br
a
nch 'sp/maint-clear-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
r
anch 'jk/maint-stash-o
o
b' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Merge b
r
anch 'jk/maint-upload-pack-
s
h
a
l
l
ow
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge branc
h
'dm/stash-k-i-p' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch
'jc/pack-objects
-
bigfile'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch
'
m
g/reflo
g
-
w
ith-o
p
t
i
o
ns' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branch 'jk/stash-loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C Haman
o
Merge branch 'ar/clean
-
r
m
dir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merg
e
branch 'mg/sh
a
1-path-advise' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Hae
n
el
git-add
.
txt:
d
ocument 'ad
d
.
ignore
E
rrors
'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pass empty file to p4merge w
h
e
r
e no base is suita
b
l
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Ro
u
illier
Look for password
i
n bot
h
CVS
and CV
S
NT pa
s
s
word files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file:
fix br
o
ken m
e
rges with alternate
w
ork
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
eff King
a
d
d tests
for merge-
i
ndex / merge-one-f
i
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
Start 1
.
7
.
5
.
1 m
a
i
n
tenance tr
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
Merge
b
ranch
'
mg/x-years-12-months' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-emai
l
: fix missing sp
a
ce in error m
e
ssage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
sh Stone
b
l
a
me: t
o
le
r
a
te bogus e-mail addresses a
bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
g
i
t
-r
e
base--inte
r
a
ctive
.
s
h
: pres
e
rve-m
e
r
g
es
fai
l
s
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: qu
o
t
e
rfc822 specia
l
s in email addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt:
s
mall typeface improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Va
l
e
n
t
i
n
H
a
enel
git-svn
.
txt: move option descriptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n
Haenel
git-svn
.
txt: fix usage
o
f --ad
d
-aut
h
or-
f
r
o
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C Hamano
htt
p
:
clear POSTFI
E
LDS whe
n
i
nitial
i
zi
n
g
a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio
C Hamano
diff-f
i
l
es: show unme
r
ged entries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: re
m
ove o
f
ten unused p
a
rameters
from diff_u
n
merg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
diff
.
c
:
retu
r
n filepair from diff_unmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
t
e
s
t:
use $_z40 from test-l
i
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
M
ichael J Gruber
date: avoid
"
X
ye
a
r
s, 12 months" in r
e
la
t
i
ve dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Ha
m
ano
Git 1
.
7
.
5
-
rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
Hama
n
o
Sync with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
aman
o
Git
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael
J
Gr
u
ber
git-svn
.
txt: Document
-
-m
e
rgeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
unio C H
a
mano
Rever
t
"run-command: pr
e
t
t
ify -D
_
FORTIFY_
S
OURC
E
wo
r
karound
"
commit
|
commitdiff
|
tree
2011-04-14
Ju
n
i
o
C Ham
a
no
Merge branc
h
'
m
aint
'
commit
|
commitdiff
|
tree
2011-04-14
R
e
n
é S
c
harfe
archive: document li
m
itation of tar
.
umask
config setti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306,
t
5
3
04: avoid
c
l
o
c
k skew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J
Gruber
git
.
txt: fix list continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Git 1
.
7
.
5-r
c
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merg
e
bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
i
o
C
H
amano
Merge branch
'
jc/r
e
v-list-op
t
i
o
n
s
-
fix'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C Ha
m
a
n
o
Merge
b
ranc
h
'js/ch
e
ckou
t
-untracked-sy
m
link' into mai
n
t
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
m
ergetool:
Teach about submodu
l
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
i
m Meyering
remov
e
doubl
e
d
w
o
r
ds, e
.
g
.
, s/to to/to
/
, and fix related
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ram
k
u
m
ar Ramachandr
a
re
v
ert: Hi
d
e
'
-r' option in defa
u
lt u
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
C
a
r
los Martín
Nieto
f
orm
a
t-p
a
tch:
d
ocument --quie
t
o
p
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Ma
r
tín Nieto
format-p
a
tch:
don't p
a
ss on the --qui
e
t
f
l
ag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herlan
d
--
d
irstat: In ca
s
e of renam
e
s, use target filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
M
erge bran
c
h '
j
s/checko
u
t-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
J
u
n
i
o C Hamano
Merge b
r
anch 'n
d
/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
annes
S
ixt
t2021:
ma
r
k a te
s
t as f
i
xe
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
nes S
i
xt
t
0
0
01: guard a new test w
i
th
S
Y
M
LINKS prerequi
s
ite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
Teac
h
--
d
irstat not to comple
t
ely ignore re
a
r
r
anged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Æ
v
ar Ar
n
fj
ö
rð Bjarmason
Makefil
e
: extract Q_() sour
c
e stri
n
gs as nge
t
t
e
xt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ram
s
a
y
Jon
e
s
i18n: av
o
i
d
parenthesized stri
n
g as arra
y
ini
t
ializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-file
:
M
a
ke
i
t fa
s
ter and more correct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-obvi
o
u
s di
f
f
erences relative
.
.
.
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 Haman
o
M
er
g
e
g
it://
g
it
.
bogomi
p
s
.
org/git
-
s
v
n
commit
|
commitdiff
|
tree
2011-04-11
J
uni
o
C Hamano
Merge git://git
.
k
e
rnel
.
org/p
u
b/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan
M
cGee
stash: ensure --no-keep-index and --patch can be used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGe
e
stash: add two more tests for --no-keep-index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
An
d
rew Garber
git
-
p4:
repl
a
ce each
tab with
8
s
paces for consist
e
n
c
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-pack:
start pack-objects before
async rev-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
ama
n
o
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
Syn
c
with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
J
un
i
o C Hamano
G
it 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Haman
o
Merge bra
n
ch 'nm
/
main
t
-co
n
flicted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
i
o C Hamano
M
e
rge branch 'mg
/
rev-
l
ist-n
-
rev
e
rs
e
-doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
Merge bran
c
h '
j
k/maint-
r
emote-m
i
rro
r
-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
a
man
o
Merge branch '
m
g/doc-
r
evisions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: drop dirty worktree check on
apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
amano
Teac
h
core
.
bigfil
e
threashol
d
t
o
pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymou
r
stash: fix fa
l
se positive in
the invalid ref test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff
King
stas
h
:
f
ix a
c
c
idental apply of non-
e
xistent stashes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Micha
e
l
J
Gruber
r
evisions
.
txt:
l
anguage improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C
H
am
a
no
Mer
g
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
next