repo.or.cz
/
alt-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/merge-custom-no-trivial'
2010-08-20
El
i
jah Newren
merge-recurs
i
v
e
:
A
voi
d
exc
e
ssive
o
utput
f
or
a
n
d
reprocessing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Hamano
M
erge branch 'maint' to s
y
nc with 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
Junio C Ha
m
ano
Git 1
.
7
.
2
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-19
J
u
nio
C
Hamano
Me
r
g
e
branch 'tr/xsize-
b
i
ts
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-08-19
J
un
i
o C Haman
o
Merge br
a
nch 'jc/
s
ha1-name-find-fix
'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-19
Ævar Arnfj
ö
rð Bja
r
mason
t/t
9
010
-
sv
n
-
fe
.
sh: add an
+
x b
i
t to t
h
is
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
u
ni
o
C Hamano
Merge branch 'sp/fix-smart-http-dead
l
o
c
k
-
on-error'
.
.
.
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
Nieder
me
r
ge s
c
ript: learn --[no-]rerere-autoupdate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rg
e
script: n
o
tice @{-1} short
h
and
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
tha
n
N
ieder
merge script:
h
andle
-
-
n
o-ff --no-commit correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge scri
p
t
:
-
-ff-only to disall
o
w tr
u
e m
e
rge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
merge sc
r
ipt: handle many-way
oct
o
pus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge s
c
ript:
h
andle
-
m
--log c
o
rrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
erge script: f
o
rbid merge -s index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
ha
n
N
ie
d
er
merge sc
r
ipt:
a
llow
c
ustom strateg
i
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Ni
e
der
m
erge script: merge -X<
o
ptio
n
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge s
c
ript: imp
r
ove
l
og
m
essage
s
ub
j
ect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nie
d
er
merge script: refuse t
o
merge during
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
c
ript: tweak unmer
g
ed files message
t
o match
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan
Nieder
m
erg
e
scr
i
pt:
--squash, --ff fr
o
m unborn bran
c
h are
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
fm
t
-
m
erge-msg -m to
override merge title
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
mer
g
e-ba
s
e
--independent t
o
print redu
c
ed
p
arent list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
athan Nieder
me
r
ge-base -
-
octopu
s
t
o
mim
i
c s
h
ow-
b
ranch --merge-base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
onathan Nieder
Documentati
o
n:
add a SEE ALSO section for merge
-
base
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
eder
t
6
200 (fmt-merge
-
msg)
:
sty
l
e n
i
t
p
i
cks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ede
r
t6010 (merge-bas
e
): mo
d
er
n
iz
e
sty
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (me
r
ge): test me
r
ge from
branch yet t
o
be b
o
rn
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
t
7600 (
m
erge): check reflog entry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n
N
ieder
t7600 (
m
erge): do not lau
n
c
h
gitk for --debug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
ede
r
t7600 (merge): modernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge:
do n
o
t mistak
e
(ancestor of) tag for branch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
David
Aguilar
s
u
bmodule
s
ync: Update
"
submod
u
l
e
.
<name>
.
url"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Æ
v
ar Arnfjö
r
ð
Bjarmaso
n
t
e
sts: fix syntax
e
rror in "Use
a
dvis
e
() for h
i
nts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ham
a
no
Merge branch 'jc/mai
n
t
-
follow-rename-fix'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch
'tf/string-
l
ist-init'
commit
|
commitdiff
|
tree
2010-08-18
J
u
nio C Hamano
Merge branch 'cc/f
i
nd-commit-sub
j
ect
'
commit
|
commitdiff
|
tree
2010-08-18
Jun
i
o C Hamano
Merge branch
'
j
n/
m
aint-plug-leak'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C H
a
m
ano
M
erge branch 'jl
/
submodule-ignore
-
diff'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Me
r
ge branch 'ml/rebase-x-stra
t
egy
'
commit
|
commitdiff
|
tree
2010-08-18
Ju
n
i
o
C H
a
mano
M
e
rge branch 'jn/fix-abbrev
'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hamano
Merge branch 'vs/doc-sp
e
ll'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Haman
o
M
erge branch
'
j
h/use-tes
t
-
m
us
t
-fail
'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C
Hamano
Merge
b
ranch 'jh/clea
n
-exclude'
commit
|
commitdiff
|
tree
2010-08-18
Junio
C
Hamano
Merge branch 'kf/post-receive-sample-hook'
commit
|
commitdiff
|
tree
2010-08-18
J
un
i
o C
Ham
a
no
Mer
g
e branch 'ab/r
e
port-co
r
rupt-object-with-type'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Hama
n
o
Merge branch 'jn
/
rebase-rename-am'
commit
|
commitdiff
|
tree
2010-08-18
Juni
o
C H
a
mano
Merge branch 'jn/fast-import-
s
ubtree'
commit
|
commitdiff
|
tree
2010-08-18
Junio C Ham
a
no
Merge
branch 'ar
/
stri
n
g-
l
ist-
f
o
r
each'
commit
|
commitdiff
|
tree
2010-08-18
J
unio C Hamano
Merge branch 'jh/graph-next-line'
commit
|
commitdiff
|
tree
2010-08-18
J
unio
C Hamano
Merge
branch
't
r
/xsize-bits'
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-r
e
cursiv
e
: Fix multiple fi
l
e r
e
name across D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah New
r
en
t6031: Add a testcase covering
multiple rena
m
es across
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
Elijah Newren
merge-recursive: Fix typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
u
ni
o
C Hamano
Merge
b
ranch
'tc/
c
hec
k
o
u
t-B'
commit
|
commitdiff
|
tree
2010-08-17
David Aguila
r
mergetool: Sk
i
p aut
o
reso
l
ved paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
Cleme
n
s Buchacher
hash binary
s
ha1 into patch id
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-17
P
etr On
d
erka
Userdiff
p
atterns
for C#
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
J
ona
t
ha
n
Nieder
t7006 (pager): add missi
n
g TTY p
r
erequisites
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jona
t
han Nie
d
er
merge: let
custom strategies intervene
i
n tri
v
ial merges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan
N
ie
d
er
t
7
6
06 (merge-theirs): mo
d
ernize style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái Ngọc Duy
m
e
rge-file: run
set
u
p_
g
it
_
directory_gentl
y
(
)
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 Ngọc Duy
v
ar:
run s
e
tup_git_di
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
2010-08-16
Nguyễn
Thái
N
gọ
c
Duy
ls-remote: run
s
e
t
u
p_git_directory_gent
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
Ngu
y
ễn Thái N
g
ọc Duy
index-pack: run setup_git_
d
irectory_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
Junio C Hamano
Merge bran
c
h 'jn/maint-se
t
u
p
-fi
x
' (early part) into
.
.
.
commit
|
commitdiff
|
tree
2010-08-16
Nguyễn Thái
N
gọc Duy
config: r
u
n
s
e
t
up_
g
it_direc
t
ory_
g
ently
(
) 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
b
un
d
l
e
:
r
un s
e
tup_
g
it_direct
o
ry_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
Ngu
y
ễn Thái Ngọc
Duy
apply
:
run setup_git_d
i
rector
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
Ævar Arnfjörð B
j
armason
log:
t
est for regressi
o
n introduce
d
in v1
.
7
.
2
-
rc0~1
0
3^2~2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan
Nieder
c
h
erry-pick/revert: Use advise(
)
for hints
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan Nied
e
r
cherry-pick
/
revert: Use er
r
or() f
o
r fai
l
ure message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonat
h
an Nieder
Introduce advis
e
(
)
to
print
hi
n
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-16
Jonathan
Niede
r
E
l
imina
t
e
“Finished che
r
ry-pick/rever
t
”
message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
onath
a
n Nieder
t90
1
0 (svn-fe): avoid symlinks in test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Niede
r
t9010 (svn-
f
e): use Unix-style path in URI
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nied
e
r
vcs-svn
:
A
v
oid %z in format st
r
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jon
a
than Ni
e
der
vcs-s
v
n: Rename dirent
p
ool to build on Window
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
onath
a
n Nieder
co
m
pat:
a
dd strtok_r()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
o
nathan Ni
e
de
r
treap: style fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Ni
e
der
vcs-svn: remove b
u
ild a
r
tifacts on "make
c
lea
n
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
J
o
nat
h
an Nieder
svn-fe
manual: Cla
r
ify w
a
r
ning about
d
eltas in dump
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonathan Nieder
Update svn-fe
manual
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
SVN
dump
p
arser
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David B
a
rr
In
f
r
a
structu
r
e to write revis
i
o
n
s i
n
fast-export
format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
D
avid Barr
Add s
t
ream helper libr
a
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David Barr
Add stri
n
g-
s
pecif
i
c memory pool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jason Eva
n
s
Ad
d
tre
a
p implementation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
David Bar
r
Add
memory pool libra
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-15
Jonath
a
n Nieder
Intr
o
duc
e
vcs-svn 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
D
a
niel Johnson
fetc
h
: allow command
line -
-
ta
g
s to override config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Brandon Casey
g
i
t-rebase--int
e
r
active
.
sh: us
e
printf ins
t
ead of echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Brandon
Casey
git-rebas
e
--interact
i
ve
.
sh
:
rewo
r
k skip_unnec
e
ssary_picks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
diff --follow: d
o
c
a
ll dif
f
core
_
std(
)
as
n
ec
e
ssa
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Junio
C
Hamano
diff
-
-f
o
llow:
d
o
not waste cycles while
r
e
c
ursing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Æ
v
ar Arn
f
j
ö
rð Bja
r
mason
perl
/
M
a
kefile:
U
ns
e
t I
N
STALL_BASE when m
a
king perl
.
mak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah
New
r
en
Mark tests th
a
t use symlinks as needing SYMLINKS prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
E
l
ijah
Newr
e
n
p
ull
-
-rebase: Avoid spu
r
ious conflicts
a
nd reapplyin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
Elijah
N
e
w
r
e
n
t5520-pull: Add t
e
stcas
e
s
showing spur
i
ou
s
conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-13
J
u
n
io C Ham
a
n
o
Merge
b
ran
c
h '
j
c/sha1-name-find-fix'
commit
|
commitdiff
|
tree
2010-08-13
Junio C Hamano
Mer
g
e b
r
anc
h
'jn/doc-pull'
commit
|
commitdiff
|
tree
next