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
Junio C
H
amano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
am
a
no
Merge b
r
an
c
h '
a
w/m
a
i
nt-rebas
e
-i
-
p-
n
o-ff
'
into
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'js/
b
lame-parsename' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge branch 'gr/cvsi
m
port-alternativ
e
-
c
vspass-loca
t
io
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge branch 'cj/
p
4merg
e
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rg
e
bra
n
ch 'jk/me
r
ge-one-f
i
le-
w
orking-tree
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
g
e
b
ranch 'jc/f
i
x-
d
iff-file
s
-unm
e
rged
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Haman
o
Merge br
a
nch 'mz/m
a
i
n
t
-
rename-unmerged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Jo
h
an Herlan
d
t5400: Fix a couple
o
f t
y
pos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Bri
t
to
Remove
d
u
p
lic
a
t
e
d "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Haman
o
t3701: fix here docume
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael J Gruber
git-fast-import
.
txt:
-
-rel
a
tive-
m
ar
k
s
take
s
n
o
paramet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
she
l
l: add missing i
n
itialization of argv0_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/annotate-t
e
sts:
Use
e
cho &
cat in
s
tead of 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
Junio C Hamano
Merge branch '
j
h/dir
s
tat' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
M
erg
e
br
a
nch 'sp/
m
ain
t
-clear-pos
t
f
i
elds'
in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch 'j
k
/maint-
s
tash-oob
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge bra
n
ch 'jk/maint-u
p
load-pack-shallo
w
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nch 'dm/st
a
sh-k-
i
-p' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merg
e
bra
n
ch 'jc/pack
-
o
b
ject
s
-bigfile
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge b
r
a
nch
'
m
g/reflog-
w
ith
-
options' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
er
g
e
bra
n
ch 'jk/stash-loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Merge branch 'ar/clean-rmdi
r
-em
p
t
y
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o
C Hamano
Merge
b
ranch
'
mg/sha1-pat
h
-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Ha
e
n
el
git-add
.
txt:
d
ocument '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
Ci
a
ran Jessup
Pass empty fil
e
to
p
4merge where
no base is suita
b
le
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy R
o
uillier
Look for p
a
s
s
word in both CVS and
CVSNT password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file:
fi
x
bro
k
e
n
merges with alternate w
o
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
a
dd tests for merge-i
n
dex /
m
erge-o
n
e-f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
Start 1
.
7
.
5
.
1 maintenance
t
rack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
ama
n
o
M
erg
e
branc
h
'mg/x-year
s
-12-m
o
n
t
hs' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylva
i
n Rabot
git-se
n
d-
e
mail: fix m
i
ssi
n
g
space in error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: toler
a
te bogus e
-
m
a
i
l
add
r
esses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew
Wong
git-rebase--interactive
.
sh: preserve-merges fails
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
Hamano
h
ttp: clear POSTFIELDS when i
n
itia
l
izing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Ha
m
ano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
uni
o
C
H
a
m
ano
d
i
ff-f
i
les: sh
o
w unmerged entr
i
es cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remove often u
n
use
d
p
arame
t
ers from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff
.
c: return filepair fro
m
dif
f
_unme
r
ge()
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,
1
2 months" in relat
i
ve dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
m
a
no
Git 1
.
7
.
5-rc
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
S
y
n
c 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
ichael
J
Gruber
git-svn
.
txt: Docu
m
ent -
-
m
e
rgei
n
fo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
R
e
vert "run-command
:
pret
t
ify -D_FORTIFY_SOURCE workaro
u
nd"
commit
|
commitdiff
|
tree
2011-04-14
Junio C H
a
mano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-14
R
en
é
Scharfe
archive: document limitation of
t
ar
.
umask config
s
etting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael J Gruber
t330
6
,t5304: avoid c
l
o
ck skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
git
.
t
x
t:
fix
list
c
o
ntinuation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
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
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Me
r
ge
branch 'jc/re
v
-lis
t
-options-
f
ix'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ham
a
no
Mer
g
e branch 'js/
c
heckou
t
-untracked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyer
i
ng
remove d
o
uble
d
words, e
.
g
.
, s/to to/
t
o/, and fix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramk
u
mar
Ramacha
n
d
r
a
revert: Hide '-r' option in default usa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan He
r
land
--d
i
rstat: In c
a
se o
f
renames, use target filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hama
n
o
Merge branch 'js/checkout-u
n
tracked-sy
m
link'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge
b
ranch 'n
d
/init-g
i
tdir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t2021:
mark a t
e
st as f
i
xed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
n
e
s
S
ixt
t
0001: guard a new test w
i
th SYM
L
I
N
K
S
prerequisi
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
Teach --dirstat no
t
to complet
e
l
y
i
gnore
r
earranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar A
r
n
fjörð Bjarmas
o
n
M
akefile: extract Q_() source
str
i
n
g
s
as ng
e
ttext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i
18n: avo
i
d par
e
nth
e
si
z
ed string as arr
a
y
initial
i
z
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herla
n
d
--dirsta
t
-
by-file:
Make it faster an
d
m
o
re correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-obvious differences rel
a
tive
.
.
.
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
gi
t
://g
i
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
J
unio C Hamano
M
erge
git://git
.
kerne
l
.
org/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash: ensure --n
o
-
keep-index and
-
-
patch
c
an be u
s
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash:
a
d
d two more
test
s
for --no-keep-i
n
de
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andr
e
w Garbe
r
g
it-p4: replace each tab with
8 spaces for co
n
sistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
K
ing
upload-pac
k
: start pack-o
b
jects b
e
f
o
r
e as
y
nc rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Gi
t
1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
unio
C
Hamano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Hama
n
o
Merge
branch 'nm/
m
aint
-
conflicted-submodule-en
t
ries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
Merge br
a
n
ch 'm
g
/re
v
-list-n-reverse-doc'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Hamano
Merge branch 'jk/maint-r
e
mote
-
mi
r
ror-safe
r
'
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hama
n
o
Merge branch 'mg/doc-revis
i
ons-
t
xt'
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f K
i
ng
st
a
s
h
: drop dirty worktree check on a
p
ply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
Teach core
.
bigfilethrea
s
hold t
o
pack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
stash: fix false positive in the invalid ref test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash:
f
ix acciden
t
al app
l
y
o
f non-ex
i
stent stashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Michael
J
Grub
e
r
rev
i
sions
.
t
x
t
: la
n
guage
improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Ham
a
no
M
e
rge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C Hamano
Merg
e
branch 'jl/submodul
e
-
fetc
h
-on-dema
n
d'
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Ham
a
no
Me
r
ge bran
c
h
'
jc
/
r
e
v-list
-
options-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER
Gábor
Documentation:
t
r
ivi
a
l
g
r
ammar fix in core
.
w
o
rktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jakub Narebs
k
i
gi
t
web: Fix parsing of negative fractio
n
al timezone
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C
H
a
mano
Merge b
r
anch 'nm/maint-conflict
e
d-submodule-e
n
t
r
ies'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
an
o
St
a
rt p
r
e
p
a
ring for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jeff K
i
ng
pull
:
do not
cl
o
bbe
r
untr
a
cked fi
l
es on initial pull
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Hamano
Mer
g
e
b
r
a
n
c
h 'jc/index-
u
pd
a
te-if-ab
l
e' into maint
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o
C H
a
mano
Merge b
r
a
n
c
h
'lt/default-abbrev' into m
a
int
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Mer
g
e branch 'jc/
m
aint-rev
-
list-cu
l
led-
b
oundary' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C Ham
a
n
o
Merge branch 'mm/maint-log-n-with-diff-filtering' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch '
j
k/format-patch-m
u
ltiline-header' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'jn/ma
i
nt-inst
a
web-pla
c
k-fix
'
into maint
commit
|
commitdiff
|
tree
next