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
Prepare for 1.7.5.2
2011-05-13
Ju
n
io C Hamano
Pr
e
p
a
re
f
o
r
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
H
amano
M
e
rge branch 'aw/maint-rebase-i-
p
-n
o
-ff'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C Hamano
M
erge b
r
anc
h
'js/blame-parsen
a
me' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
mano
M
e
rge branc
h
'g
r
/cvsimport-alt
e
r
n
ative
-
c
v
spass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
M
e
rge branch 'cj/p4
m
erge' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hama
n
o
Merge
bran
c
h
'jk/m
e
rge-one-f
i
le
-
working-tree
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branch 'jc/
f
ix-dif
f
-file
s
-u
n
merged'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Me
r
ge b
r
an
c
h 'mz/maint-rename-unmerged
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: Fi
x
a
coup
l
e of
t
y
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
oão
B
ritto
Remov
e
dup
l
ica
t
ed "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C Hama
n
o
t
3
7
01: fi
x
here document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hae
l
J Grube
r
g
it-
f
ast-impo
r
t
.
txt: --re
l
ative-marks
t
a
kes no parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sh
a
ro
v
she
l
l: ad
d
missi
n
g initia
l
ization of argv0
_
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Ge
r
nhardt
t/anno
t
a
te-tes
t
s: Use echo & cat instead
of
s
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
G
i
t 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C H
a
ma
n
o
M
er
g
e
branch 'jh/
d
irsta
t
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge br
a
nch 's
p
/ma
i
n
t
-cl
e
ar-postfields'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch '
j
k
/ma
i
nt-s
t
ash-oob'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merg
e
branch 'jk/main
t
-upload-
p
ac
k
-
s
hallow'
into
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merg
e
branch 'dm/stash-k
-
i-p' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
Merg
e
bra
n
ch 'jc/pack-objects-b
i
g
file' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e branch 'mg/reflog-with-options' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
erge branch 'jk/stas
h
-loosen-safety' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'ar
/
c
lean-rmdir-empty' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
amano
Merge b
r
anc
h
'
m
g/sh
a
1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Val
e
ntin Haenel
git-add
.
txt: document 'a
d
d
.
ignoreEr
r
ors'
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 f
i
le to p
4
merge where no base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy R
o
uil
l
i
e
r
Look for password in both
CVS and CVSNT pas
s
word f
i
les
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merg
e
-one-file: fix broken merges wi
t
h al
t
ernate
w
or
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
King
a
dd tests for
merge-in
d
ex /
m
erge-one-fil
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1 maintenance tr
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge b
r
anch 'mg/x-years-12-months' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send
-
emai
l
: f
i
x missing
sp
a
ce
in
e
rror message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
bla
m
e: tolerate bogus e-mail addr
e
sses a b
i
t better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
And
r
ew W
o
n
g
gi
t
-rebase
-
-int
e
ractive
.
sh: pres
e
rv
e
-
m
erges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C
Hamano
http: clea
r
POSTFIELDS wh
e
n initi
a
lizing a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
diff-
f
i
l
es: show unmerged entries correct
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: r
e
m
o
v
e
oft
e
n unu
s
ed parameter
s
fro
m
diff_unmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
diff
.
c
:
re
t
u
rn fi
l
epair f
r
om diff
_
unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $_z40
from test
-
lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J Gruber
date: av
o
id "X years, 12
m
o
nths" in relative dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git
1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sy
n
c
with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Juni
o
C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
hael J Gruber
git-svn
.
txt:
D
o
c
u
ment
-
-mer
g
einfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Revert "run-
c
ommand: pretti
f
y -D_FORTIF
Y
_SOURCE worka
r
ound
"
commit
|
commitdiff
|
tree
2011-04-14
Junio C
Ha
m
ano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
R
e
né Scharfe
archi
v
e: document limitation of tar
.
umask
c
onfig setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306,t5304: avoid clock skew
i
ssues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michae
l
J G
r
ube
r
gi
t
.
txt: fix
l
ist continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
Gi
t
1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge bran
c
h
'
maint
'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
M
erge branch 'jc/
r
ev-list-options
-
fix
'
into main
t
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
i
o C Hamano
Merge branch 'js/ch
e
ckout-untracked
-
symlin
k
' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyer
i
ng
r
emove double
d
words, e
.
g
.
, s/to
t
o/
t
o/,
a
nd
f
ix rela
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar
Ramachandra
r
e
vert:
H
i
de '-r' op
t
i
on in default usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herl
a
nd
--dirst
a
t:
In case of
r
enames, use ta
r
get file
n
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
J
unio C H
a
mano
Me
r
ge bran
c
h 'js/checkout
-
untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio
C Ha
m
ano
Merge bran
c
h '
n
d/ini
t
-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Johann
e
s Sixt
t2021: mark a te
s
t as fixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
nes
Sixt
t
000
1
: guard a new test
wi
t
h SYML
I
NKS
p
rere
q
uis
i
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
Teach --dirstat not to completely i
g
n
ore rea
r
range
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð Bjarmaso
n
Ma
k
e
f
i
l
e
: extract
Q
_() source strings as ngettext(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Rams
a
y Jones
i18n: avoid p
a
re
n
thes
i
zed string as array initializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-
dirst
a
t
-
by-file: Make it f
a
ster and more correct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
oh
a
n
H
erland
--
d
irstat:
D
escribe non-obvious diffe
r
enc
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
Jun
i
o
C Hamano
Merg
e
git://git
.
bogomips
.
o
rg/git-s
v
n
commit
|
commitdiff
|
tree
2011-04-11
Junio C Ham
a
n
o
Merge g
i
t://g
i
t
.
kernel
.
o
rg/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan
McGe
e
stash: en
s
ure --no-kee
p
-i
n
dex and --
p
atch can be used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
D
a
n McGee
stash: add two more
t
ests for -
-
no
-
keep-index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
gi
t
-
p4:
replace each tab with 8 spaces for
cons
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 as
y
nc
r
ev-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
Juni
o
C Hamano
S
y
nc wit
h
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o 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 Hamano
Me
r
ge bran
c
h
'nm/maint-conf
l
icted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio
C H
a
mano
Merge branch 'mg/rev-list-n-
r
everse-d
o
c' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Merge branch 'jk/main
t
-remo
t
e-m
i
rr
o
r-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Ha
m
ano
M
e
rge branch 'mg
/
d
o
c
-
re
v
isions-txt'
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
stash: drop d
i
rty workt
r
ee check on appl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
amano
T
e
ach core
.
bigfil
e
threashol
d
t
o pack-ob
j
ects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
stash: fix fa
l
se positive in the
i
nval
i
d
r
e
f te
s
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff Kin
g
st
a
sh: fix
a
ccidental apply of non-existent stashes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Michael J
G
ruber
revisions
.
txt:
l
an
g
ua
g
e impr
o
vements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio
C Hamano
M
erge bra
n
ch
'
m
aint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Hamano
Merge br
a
nch 'jl/submodule-
f
etch-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge
bra
n
c
h
'
jc/rev-l
i
s
t
-op
t
ions-fix'
commit
|
commitdiff
|
tree
2011-04-04
S
Z
EDER Gábor
Doc
u
mentati
o
n
:
trivial grammar fix i
n
core
.
wor
k
tree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
a
kub Nareb
s
k
i
gitweb: Fi
x
par
s
ing
of negative fractional
t
imezones
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
i
o C Hama
n
o
M
e
r
ge branch
'
n
m/ma
i
nt-conflicted-su
b
m
odule-ent
r
ies'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Hamano
Start preparing for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jeff
K
ing
pull: d
o
not clobber un
t
ra
c
ked files on in
i
tial pull
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
a
mano
Merge branch 'j
c
/index-u
p
date-if-able
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
ano
Merge
branc
h
'lt
/
defau
l
t-abbrev' i
n
to maint
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio
C Hamano
Merge branch 'jc/maint-rev-list-culled-bou
n
dar
y
' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C H
a
mano
Merge branch 'mm/maint-log-n-with-diff-fil
t
e
r
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
unio C
Hamano
M
erge branch 'jk/format-patch
-
mu
l
tilin
e
-hea
d
er' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
a
mano
Merge branch 'jn/m
a
int-in
s
taw
e
b
-plack-fi
x
'
into maint
commit
|
commitdiff
|
tree
next