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 'jn/update-contrib-example-merge'
2010-08-18
Jo
n
at
h
an Nieder
t760
0
(merge): te
s
t merge from b
r
anch yet to be born
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): check
r
eflog en
t
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merge): do no
t
launch gitk
f
or
-
-
d
e
b
u
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
atha
n
Nieder
t7600 (merge):
m
od
e
rnize style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge:
do not mistake (ances
t
or
of) ta
g
f
o
r branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
D
a
v
i
d Ag
u
i
lar
subm
o
dule syn
c
: Update "submo
d
ule
.
<name>
.
url"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Æ
v
a
r Arn
f
j
örð Bj
a
rmaso
n
tests: fix
syntax error in
"
Use ad
v
ise() for
hints
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Junio
C Hamano
Merge branch 'jc/mai
n
t-follow-ren
a
me-fix'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io C Hamano
Me
r
ge branch
'tf/st
r
ing
-
list-init'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branc
h
'
cc/fin
d
-
commit-subject'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Merge bra
n
c
h
'
jn/mai
n
t-plu
g
-
leak'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C
H
ama
n
o
Merge branch 'jl/submodule-ignore-diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Hamano
Merge branch 'ml/rebase-x-strategy'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge
b
ranch 'jn
/
fi
x
-abbrev'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Ha
m
ano
Merge bra
n
c
h
'
vs/do
c
-spell
'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io C Hamano
Me
r
ge branch 'j
h
/u
s
e-test-m
u
s
t
-
f
ail'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Me
r
ge b
r
anch 'jh/clean-exc
l
u
de
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ham
a
no
Merg
e
branch
'
kf/p
o
s
t
-receiv
e
-
s
ample-hook'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ha
m
a
n
o
M
e
r
ge br
a
nc
h
'ab/report-corrupt-object-with-type'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Hamano
Merge branch
'
j
n/rebase-rename-am'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge br
a
nch
'jn/fast-im
p
ort-subtree'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Hamano
Me
r
ge branch 'ar
/
s
trin
g
-list-fo
r
each'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C
Hamano
M
e
rg
e
branch 'jh/graph-next-line'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'tr/xs
i
ze
-
bits'
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-recursive
:
F
i
x multiple file
rena
m
e
across D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Elija
h
Newren
t6031: Add a testcase cover
i
ng multiple renames across
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
E
l
ijah
N
ewren
m
erge-recur
s
ive:
F
i
x
typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
io C Hama
n
o
Merge branch '
t
c
/che
c
kout-B'
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
me
r
g
etool:
Skip autor
e
s
o
lve
d
path
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Cleme
n
s
B
uc
h
ach
e
r
hash binary sha1 in
t
o patch i
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-17
Petr Onderka
Userdif
f
patterns fo
r
C
#
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
J
o
nat
h
an Nieder
t700
6
(pager): ad
d
missing T
T
Y prerequisites
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
N
g
u
y
ễn
T
h
á
i Ngọ
c
Duy
merge-
f
i
le: run se
t
up_git_directory_gen
t
ly() soon
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ng
u
y
ễ
n Thái Ngọc Duy
var: ru
n
setup_gi
t
_
d
i
r
ector
y
_gently
(
) sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái
N
g
ọc Duy
ls-
r
emote:
r
u
n s
e
t
u
p_git
_
directory_g
e
ntly() so
o
ner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
N
g
uyễn
Thái Ngọc D
u
y
index-pack: run setup_git_d
i
rectory_gentl
y
()
so
o
ner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Junio C Hamano
Merge branch
'
jn/maint-set
u
p-fix' (early par
t
) into
.
.
.
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thá
i
Ngọ
c
Duy
config: run setup
_
git_director
y
_g
e
ntly() so
o
ner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ngu
y
ễn
Thá
i
Ngọc Duy
bun
d
le: run setup
_
git
_
directory_gently(
)
sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn T
h
á
i N
g
ọ
c
Duy
apply: run setup_g
i
t_direct
o
r
y
_
gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Ævar Arnfjörð B
j
armaso
n
log: test for regressi
o
n i
n
troduced in
v
1
.
7
.
2-rc0~103^2~2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
cherry-pick/revert: Use advise() for hints
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nie
d
er
cherry-pick/revert:
U
se error() f
o
r fa
i
lure
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nieder
I
n
troduce advise() to pr
i
nt hints
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-16
Jonath
a
n N
i
e
der
Eli
m
i
n
ate “Finish
e
d cherry-pick/revert
”
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Niede
r
t9010 (svn-fe): av
o
id syml
i
nks in test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
t9010
(s
v
n-f
e
):
use Un
i
x-st
y
le path in URI
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jon
a
than Nieder
v
c
s-
s
v
n
:
Avoid %z in for
m
at string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Ni
e
der
v
cs-svn:
Rename
dirent
pool
to b
u
ild on Windo
w
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
J
o
n
athan Nieder
com
p
at: ad
d
strt
o
k_r()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan N
i
e
d
er
t
r
e
a
p: style fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
J
onathan Nieder
vcs-svn:
r
e
m
ove build
a
r
t
ifacts on "m
a
ke clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jona
t
han Nieder
svn-fe manu
a
l: Cl
a
rify warning about delta
s
in
dump
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
J
o
na
t
ha
n
Nieder
Update svn-fe manual
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Dav
i
d Barr
SVN
d
ump parser
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
I
n
frast
r
ucture to
wri
t
e re
v
isions in fast-export fo
r
mat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Davi
d
B
a
rr
Add
st
r
eam
helpe
r
library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Add st
r
ing
-
spe
c
ifi
c
me
m
ory pool
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jason Evans
Add treap i
m
pl
e
me
n
t
a
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Da
v
id Barr
Add me
m
ory pool l
i
brary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Jona
t
han N
i
eder
Introd
u
ce vcs-s
v
n lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-15
Daniel J
o
hnson
f
e
tch: allow c
o
mmand line --tags to over
r
ide
config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
B
r
andon Casey
git-rebase-
-
in
t
eractive
.
sh: use printf in
s
tead of e
c
ho
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Brandon Casey
git-reb
a
se--interac
t
ive
.
sh: rew
o
rk skip_unnecessary_picks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
J
unio C
Ha
m
an
o
di
f
f --follo
w
:
do
call diffcor
e
_s
t
d() as
n
e
c
essary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
diff --follow: do not
waste cycles w
h
ile
recursing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Ævar Arnfj
ö
rð Bjar
m
aso
n
pe
r
l/Makefile: Uns
e
t INSTA
L
L_BASE w
h
e
n
makin
g
p
erl
.
mak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newre
n
Mark tests that use s
y
m
l
inks
a
s needing SY
M
LINKS
p
r
erequisit
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
p
u
ll -
-
reb
a
se: Avoid spuriou
s
conflic
t
s
a
nd
r
eappl
y
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
Elijah
New
r
en
t5520-
p
ull: Add testcase
s
showing spurious conflicts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-13
J
unio C
Ha
m
ano
Merge branch 'jc/sha1-name-find-fix'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io C Hamano
M
e
rge branch '
j
n/doc
-
p
u
l
l'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Mer
g
e
b
r
anch 'jn/maint-g
i
tweb-dynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C H
a
mano
Merg
e
branch 'bc/
u
se-m
o
re-h
a
rdlinks-in-ins
t
a
l
l'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge
b
r
a
nc
h
'tr/rfc-reset-doc'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branch 'jn
/
parse-date-basic'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ham
a
no
Me
r
ge
b
ra
n
ch 'sp/fix-smart-ht
t
p-deadlo
c
k-on-error'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io C Hamano
Merge bran
c
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2010-08-13
Matthieu Moy
p
ush: menti
o
n "git pu
l
l" in error
message for non-fast
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Jonathan Nie
d
er
Standa
r
di
z
e do {
.
.
.
}
w
h
i
le
(
0
)
styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
Brandon
C
a
sey
t/t7003: re
p
lace \t
with literal tab in sed express
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-12
N
el
s
on
Elhage
i
n
de
x
-pack
:
D
o
n't follow replace ref
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Spence
r
E
.
Olson
Allow
H
TTP user age
n
t
s
tring to be mod
i
fied
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jun
i
o C Hamano
M
e
r
g
e
b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
pos
t
-
recei
v
e-em
a
il:
r
emove sp
u
rious commas
in e
m
ail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Raj
a
R
Harinath
fast-
i
mport: export co
r
r
ec
t
ly marks la
r
ger than 2
^
2
0
-1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Ævar Arnfjörð Bjarmason
t/lib-gi
t
-
svn
.
sh:
us
e
$PERL_PAT
H
for perl, not perl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gasselin
t7609: test merge a
n
d check
o
u
t
e
r
ror me
s
sages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
M
a
tthieu Mo
y
unpack
_
trees:
gro
u
p error messages by type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu
M
oy
merge-recursive: dis
t
ing
u
ish "
r
emoved"
an
d
"overw
r
itte
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gasseli
n
mer
g
e-
r
e
c
u
rsive: porcelain
me
s
sag
e
s
for
c
h
eckout
8ccba008 (
Junio C Hamano
, Sat May 17 21:03:49 2008, unpack...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
M
atthieu Moy
Turn unpack_trees_options
.
msgs
i
nto an array + enum
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu
Moy
test
-
lib
:
user-f
r
iendly
a
l
ternatives t
o
t
est
[
-d|-f|-e]
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu
Moy
rebase -i: add ex
e
c command to
l
a
unch a s
h
ell
command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jo
n
athan Nieder
write-tree: Avoid leak
when index refers
to an
i
n
valid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonat
h
an Nieder
read-tree
:
s
t
op leaking t
r
ee obj
e
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jonat
h
an Nieder
core: Stop leaking ondisk_cache_entrys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Jakub Nareb
s
ki
d
iff: s
t
rip extra
"/" wh
e
n
stri
p
ping prefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Greg Broc
k
m
a
n
spl
i
t_cmdli
n
e: Allow caller to a
c
cess
err
o
r s
t
ring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Nguyễn Thái
Ng
ọ
c
D
uy
grep: r
u
n se
t
up_git_d
i
r
ectory
_
gently() sooner
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next