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 'jm/mergetool-submodules' into maint
2011-05-15
Jun
i
o C
H
a
mano
M
e
rge branch 'jm/mergetool-sub
m
odule
s
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io C Hamano
Merge branch '
j
k/f
o
rmat-patch-quote-special
-
i
n-fro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
amano
M
erge branch 'vh/gi
t
-svn-doc
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
git_open_no
a
time(): dro
p
unused parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
sha
1
_file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, merge, diff: do
not use strcase
c
mp to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Prep
a
r
e
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
M
e
rge branch 'aw/maint-
r
ebase-i-p-no
-
ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
e
r
g
e bran
c
h 'js/blame-pars
e
na
m
e
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
M
erge branch 'gr/cvsimport-alternative
-
cvspass-loc
a
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
b
r
anch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C H
a
m
a
no
Merge br
a
nch 'jk/m
e
rge-one-fi
l
e-
w
orking-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch 'jc/
f
ix-diff-files-
u
nm
e
rged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
g
e
b
ranch 'mz/main
t
-re
n
a
m
e-unmer
g
ed' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
o
han H
e
rland
t
5400: Fix a
co
u
p
le
o
f typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jo
ã
o Bri
t
to
Remov
e
duplicated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C
H
amano
t3701: fix
here
doc
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
ichae
l
J Gr
u
ber
g
i
t-fast-im
p
ort
.
txt: --
r
elat
i
ve-marks ta
k
es
n
o parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima
S
h
a
rov
shell: add missing
i
ni
t
i
ali
z
ation of
argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian
Gernhardt
t/annotate-te
s
ts: Use echo & ca
t
instead of se
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hama
n
o
G
i
t
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o
C
Hamano
M
er
g
e branch
'jh/
d
irst
a
t' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge
b
ranch 'sp/
m
aint-cl
e
ar-postf
i
elds' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/
m
a
int-st
a
sh
-
oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch '
j
k
/
maint-uplo
a
d-pa
c
k-s
h
allow' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge bra
n
c
h
'dm/
s
tash
-
k
-
i
-
p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
a
m
ano
Merge branch 'jc/pack-objects-bigfi
l
e
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
M
e
r
g
e b
r
a
nch 'mg/reflog-wi
t
h-options' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'j
k
/
s
tash-loosen
-
safety
'
i
nto
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C H
a
mano
Me
r
g
e
branch 'ar/clean-rmdir-em
p
t
y' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C
Hama
n
o
Merge branch '
m
g
/
sha1
-
path-a
d
vi
s
e
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
V
a
l
e
ntin
Haenel
git-
a
dd
.
txt: document
'add
.
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
C
iar
a
n Jessup
Pass empty file to p4
m
er
g
e where no base is su
i
table
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Roui
l
lie
r
Look for
pass
w
ord in bo
t
h
CV
S
and
CV
S
NT
p
assword fi
l
es
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file:
f
ix broken
mer
g
e
s with al
t
ernate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add t
e
sts for m
e
r
ge-inde
x
/ merg
e
-
o
ne-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Ham
a
n
o
Star
t
1
.
7
.
5
.
1 m
a
int
e
n
a
n
ce tra
c
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
Me
r
ge branch 'mg/
x
-yea
r
s
-12-
m
onths'
into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain R
a
bot
g
i
t
-send-em
a
i
l
:
fix missing
s
pace in error mes
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Sto
n
e
blame:
t
olerate bogu
s
e-mail add
r
esses a bit bet
t
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git
-
rebase--interactive
.
sh: pres
e
rve-merges fails o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty:
quote
rfc822 speci
a
ls
i
n emai
l
addres
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
V
ale
n
tin Hae
n
el
git-s
v
n
.
txt: s
m
all
typeface improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin
H
aenel
git-svn
.
txt: m
o
ve option des
c
rip
t
i
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: fix us
a
ge of --add-author-
f
rom
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Ham
a
n
o
http
:
cle
a
r
P
O
STFIELDS when initia
l
iz
i
ng a sl
o
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
io
C Hamano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hama
n
o
diff
-
fil
e
s
: sh
o
w unmerged entries
correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Ha
m
ano
d
i
ff: r
e
move o
f
ten unused parameters
f
rom diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
i
o C
H
a
mano
diff
.
c: retur
n
f
ilepair
f
r
o
m dif
f
_u
n
merge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
t
e
s
t
: use $_z40 from te
s
t-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gru
b
e
r
date: avoid "X years, 1
2
months" in relati
v
e dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
man
o
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
amano
Sy
n
c with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mich
a
e
l J Gruber
g
i
t
-
s
vn
.
txt: Document --mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Ju
n
io C Haman
o
Revert "run
-
com
m
and
:
p
rettify
-
D_FORTI
F
Y_SOURCE
w
orkaround"
commit
|
commitdiff
|
tree
2011-04-14
Jun
i
o C Ham
a
no
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archive: docu
m
e
n
t
lim
i
tatio
n
of t
a
r
.
uma
s
k confi
g
s
e
t
ting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mich
a
e
l
J
Gruber
t
3306,t5304: avoid
clock ske
w
i
ssues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael J Gruber
git
.
tx
t
: fix lis
t
continua
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Hamano
Git
1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Ha
m
ano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
aman
o
Merge bra
n
ch 'jc/rev-list-options
-
fi
x
' into main
t
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
Merge br
a
n
ch 'j
s
/
c
hec
k
o
ut-untrack
e
d-
s
ymlink'
into maint
commit
|
commitdiff
|
tree
2011-04-13
J
o
n
a
t
h
on Mah
merg
e
tool: Teach a
b
o
ut sub
m
odules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
im Mey
e
ring
r
em
o
ve d
o
u
bled
words, e
.
g
.
,
s/to to/to/, and fix related
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachandra
revert
:
Hide '-r
'
optio
n
in
d
efault
u
sag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
J
o
han
H
erland
--d
i
rstat: In case
o
f
r
enames, use target
fi
l
e
name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Haman
o
Merge branch 'js/checkout-u
n
tr
a
cked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Ham
a
no
Merg
e
br
a
nc
h
'
n
d/
i
nit-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
nnes S
i
xt
t2021: mar
k
a test a
s
fixe
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
nnes Sixt
t0001: guard a new test
wit
h
SYMLINKS pr
e
requisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
Teach --dirstat not to c
o
mpl
e
t
e
l
y
ignore
rearranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð Bjarm
a
son
Makefi
l
e:
e
xtra
c
t Q
_
() source s
t
rings as ng
e
ttext()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n: avoid pa
r
enthesized string as arra
y
i
niti
a
lizer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-fil
e
:
Mak
e
it faster and more correct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--dirst
a
t
:
Describe non
-
obvious differenc
e
s 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 H
a
mano
M
erg
e
git://git
.
bogomi
p
s
.
o
r
g/g
i
t-svn
commit
|
commitdiff
|
tree
2011-04-11
J
unio C Hama
n
o
M
erge git://git
.
kernel
.
org/pu
b
/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan Mc
G
ee
stash: ensur
e
-
-no-keep-in
d
ex and --pat
c
h can be
used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
st
a
s
h:
a
d
d
t
w
o
m
o
re
t
est
s
for --no-keep
-
index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
git-p4: r
e
place each tab w
i
th 8 spaces fo
r
consistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-pac
k
:
sta
r
t pack-
o
bjects before async rev-l
i
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git 1
.
7
.
5
-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Sy
n
c wit
h
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Haman
o
G
it 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io
C
H
a
mano
Merge branch 'nm/main
t
-confl
i
cted-submodule-e
n
tries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hama
n
o
Merge bran
c
h 'mg/re
v
-list-n-r
e
verse-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
M
e
r
g
e branch
'
jk/ma
i
nt-remote-mirr
o
r-sa
f
er'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Mer
g
e bra
n
ch 'mg/doc
-
rev
i
sions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f K
i
ng
stash:
d
rop dir
t
y
worktree check on apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C Ham
a
no
T
each co
r
e
.
bigfilethr
e
a
s
hold t
o
pack-o
b
jects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
on Seymour
stash: fix false
p
ositive in
t
he invalid
ref
test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
stash: fix ac
c
iden
t
al apply
o
f non-exi
s
t
e
nt sta
s
he
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Michael J Gru
b
er
revisions
.
txt: languag
e
improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C
H
amano
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'j
l
/submodule-fetch-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ha
m
a
no
Merge branch
'jc/r
e
v
-
lis
t
-
options
-
fix'
commit
|
commitdiff
|
tree
2011-04-04
S
Z
E
DER Gá
b
or
D
o
cumentation: tr
i
v
i
al grammar
f
ix in
c
ore
.
worktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next