repo.or.cz
/
git
/
jnareb-git.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/doc-backslash'
2010-08-18
J
o
nathan N
i
eder
merge
script:
n
ot
i
c
e
@{-1} sho
r
thand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
eder
merge sc
r
ipt: han
d
l
e --no-ff --no-commit corre
c
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
Ni
e
der
merge
scri
p
t: --ff
-
only t
o
disallow true merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
m
erge script:
handle m
a
ny
-
way oc
t
op
u
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge script:
h
a
ndle -m --
l
og
c
o
rrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nied
e
r
merge sc
r
ipt:
forbi
d
me
r
ge -s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nied
e
r
merge script:
a
llow custom strat
e
gies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
at
h
an
N
ieder
me
r
g
e
s
cript: merge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
script: imp
r
ov
e
log m
e
ssage subject
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan
Nieder
m
e
rge
scr
i
pt: refuse t
o
m
erge dur
i
ng
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
me
r
ge script: tweak
u
n
m
erg
e
d
files me
s
sage
t
o match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge scrip
t
: --squash, --ff from
u
n
born br
a
nch are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg -m to ov
e
rride merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
m
erge-
b
ase --independent to prin
t
reduced paren
t
l
i
st
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
mer
g
e-b
a
se --octop
u
s to
m
i
m
ic
s
h
o
w-branch --merge-
b
a
s
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
Docu
m
ent
a
tion: add a SEE ALSO sectio
n
for merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
na
t
han Nied
e
r
t6200
(f
m
t-merge-msg): style nitpicks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6010
(
merge-base)
:
mo
d
ernize st
y
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an
Nieder
t7600 (
m
erge): test merge from b
r
a
n
c
h
yet to be bor
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
Nieder
t7600
(merge): check reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
i
eder
t
7600 (merg
e
): do
n
ot
l
aun
c
h
g
itk for
--debu
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
t7600 (merge
)
:
mode
r
ni
z
e style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erg
e
: do not
m
istake (an
c
estor of) tag for branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Da
v
id Aguilar
submodule sync: Update "submodule
.
<name>
.
url"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Ævar Arnfjör
ð
Bjarmason
te
s
ts: fix s
y
ntax
e
rror in
"
Us
e
advise() fo
r
hints
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Merge
b
r
a
nch '
j
c/maint-f
o
ll
o
w
-rename-f
i
x'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
Hamano
M
e
rge br
a
nch '
t
f
/st
r
ing
-
list-init'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C
Hamano
Merge branch 'cc/find-c
o
mmit
-
s
ubject
'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
io C H
a
m
ano
Merge
b
ran
c
h 'j
n
/ma
i
n
t-plug-leak'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hama
n
o
Merg
e
branch 'jl/submodule-ignore-dif
f
'
commit
|
commitdiff
|
tree
2010-08-18
J
un
i
o C Ham
a
no
Merge
b
ranch 'ml/re
b
ase-x-strateg
y
'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C H
a
ma
n
o
Merge br
a
nch
'jn/fix-abbre
v
'
commit
|
commitdiff
|
tree
2010-08-18
J
u
n
i
o C Hamano
Mer
g
e branch 'vs/doc-spell'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hamano
Merge branch 'jh/use-test
-
must
-
fa
i
l
'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
i
o
C Haman
o
M
e
rge branc
h
'j
h
/clean-exclude'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C
Ham
a
no
Me
r
ge branch 'kf
/
post-rece
i
ve-sample-hook'
commit
|
commitdiff
|
tree
2010-08-18
J
unio
C
Ham
a
n
o
M
e
rge bra
n
ch 'ab/re
p
ort-corrupt-ob
j
e
c
t-with-type'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
i
o
C Hamano
Merge branch 'j
n
/rebase
-
rename-am'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o
C
H
am
a
n
o
Merg
e
branch 'jn/fa
s
t
-import-subtree
'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C
Hamano
Merge branch
'ar/
s
t
ring-list
-
fo
r
ea
c
h'
commit
|
commitdiff
|
tree
2010-08-18
Junio C
H
aman
o
Merge br
a
nch 'jh/graph-
n
ext-li
n
e'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ham
a
no
Merge branch 'tr/xsize-bits'
commit
|
commitdiff
|
tree
2010-08-18
Elijah N
e
wre
n
merge-recu
r
s
ive: Fix multiple file renam
e
acro
s
s
D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
t
6031: Add a te
s
tcase covering multiple renam
e
s across
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
m
erge-recu
r
sive: Fix
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C Haman
o
Merge bran
c
h 'tc/checkout-B'
commit
|
commitdiff
|
tree
2010-08-17
David Aguilar
mergetool: Skip autoresolved paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
Clemens Buch
a
cher
hash bin
a
ry sha1 into patch i
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
P
etr Onderk
a
Userdif
f
patterns for C#
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan N
i
eder
t7006 (
p
a
g
er
)
: add missing TTY prerequis
i
tes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Ng
u
yễn Thái Ngọc Du
y
mer
g
e
-
file: run set
u
p_git_directory_gently()
s
ooner
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
v
ar: run set
u
p_
g
i
t
_directory_gently() so
o
ne
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
Nguyễn
Th
á
i
N
g
ọ
c Duy
ls-remote: run s
e
tup_git_director
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
Ngọc Duy
i
n
dex
-
pack: run set
u
p_git_directory_ge
n
t
l
y() 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
Junio C Hamano
Merge
branc
h
'
j
n/maint-s
e
tup-f
i
x' (
e
a
r
l
y pa
r
t) i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-08-16
N
guyễn Thá
i
Ngọc Duy
conf
i
g:
run setu
p
_gi
t
_
d
irectory_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 Du
y
bundle: run
s
etup_git
_
director
y
_
gently()
s
o
oner
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 Ng
ọ
c Du
y
apply: run setup_g
i
t_di
r
ectory_gentl
y
() 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
Æ
v
ar Arnfjörð Bjarm
a
son
log: test
f
o
r regr
e
s
s
i
o
n in
t
roduced in v1
.
7
.
2-r
c
0~103^2~2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jon
a
than Nieder
cherry-pick/revert: Use advise
(
) for hints
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jon
a
than Nie
d
e
r
cherry-pick/revert: Use error() for failur
e
message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonat
h
an Nied
e
r
Intro
d
uce
advise(
)
to
p
rint h
i
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jona
t
han Nieder
Eliminate “Finished cherry-pick/revert” message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan
N
ieder
t
9
010 (svn-fe): avoid sy
m
links in test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jo
n
a
than Nieder
t9010 (svn-fe): use Unix-style pat
h
in URI
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
vcs-
s
v
n: Avo
i
d %z in format string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
onat
h
an
Nieder
vc
s
-s
v
n: Rename
d
irent pool t
o
build on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonat
h
an Nieder
c
ompa
t
: add strtok_r()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
t
r
e
ap: styl
e
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jo
n
athan
Nied
e
r
v
cs-
s
vn: rem
o
ve
b
uild
a
rtifacts o
n
"make clean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
svn-fe ma
n
ual: Cl
a
rify warning about del
t
as
i
n dump
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
o
nathan Nieder
Upd
a
te svn-fe manual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Davi
d
B
arr
SVN dump parser
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
In
f
rastr
u
cture t
o
write revisi
o
n
s
in
fast-e
x
p
o
rt format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Dav
i
d Barr
Add strea
m
he
l
per libra
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Da
v
i
d Barr
Add string
-
speci
f
ic memory
pool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jason Ev
a
ns
Add trea
p
implement
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Add memory pool libr
a
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
o
na
t
h
an Nie
d
er
Intro
d
uce vcs-svn
l
ib
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 Johnson
fetch: allow command line --tag
s
to override con
f
ig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Bran
d
on Casey
git-rebase--interactive
.
sh: use prin
t
f
i
nst
e
ad of echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
B
randon Casey
gi
t
-rebase-
-
interac
t
ive
.
s
h
: rework skip_unnec
e
ssary_picks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hama
n
o
diff --follow: do call dif
f
c
o
r
e
_s
t
d
(
) as n
e
cessary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Ha
m
ano
diff
-
-
follow: do
n
ot waste cycles whi
l
e recurs
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Ævar Arn
f
jörð Bja
r
m
a
s
on
perl/Makefile: Un
s
et INSTALL_BASE
w
h
e
n
maki
n
g perl
.
mak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
Mark tests that use
symlinks
a
s ne
e
d
i
ng S
Y
MLIN
K
S prerequ
i
site
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah Newren
pull --rebase
:
A
v
oid spurious confli
c
ts and reapplying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
El
i
jah
N
ewren
t5520
-
pull:
A
d
d
testcases
showing s
p
urious co
n
f
l
icts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Hamano
Merge
branch 'jc/sha1-name-find-fix
'
commit
|
commitdiff
|
tree
2010-08-13
J
unio C Hama
n
o
Merge branch 'jn/d
o
c
-pull'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge branc
h
'jn/ma
i
nt
-
gitweb-
d
ynconf'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Haman
o
Merge
b
r
an
c
h
'bc/use
-
m
ore-hardlinks-in-install'
commit
|
commitdiff
|
tree
2010-08-13
Jun
i
o
C Hamano
Merge
b
ra
n
ch 'tr/r
f
c-reset-doc'
commit
|
commitdiff
|
tree
2010-08-13
Ju
n
io
C
Hamano
Merge branch 'jn/parse-d
a
te-basic'
commit
|
commitdiff
|
tree
2010-08-13
J
u
n
io C Hamano
Merge branch 'sp/fix-smart-
h
t
t
p-
d
eadlock-
o
n-error'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-08-13
Ma
t
thieu Moy
p
ush: mentio
n
"git pul
l
"
in error messag
e
for non-fast
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Jonath
a
n Nieder
Standardize
d
o {
.
.
.
}
while (
0
) style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Brandon Cas
e
y
t
/t7003: replace \t wit
h
literal
t
a
b in sed expression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-12
Nelson Elh
a
ge
index-pack
:
Don't foll
o
w
replace refs
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next