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-recursive: Delay handling of rename/delete conflicts
2010-09-30
Elijah Newr
e
n
me
r
ge-recursive: D
e
lay hand
l
ing of rename/dele
t
e confli
c
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-
r
ec
u
rsive: Move handl
i
ng of
d
ouble r
e
na
m
e
of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
ren
merge-recursive: Move handlin
g
of double r
e
name of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-recursive: Avoi
d
d
oubly me
r
ging rename/ad
d
conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
ive:
U
p
date merge
_
content()
c
all
si
g
nat
u
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recursive: Update conflict_rename_
r
ename
_
1
t
o2
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-recursive: Stru
c
ture
proc
e
ss_df_entry() to handle
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newre
n
m
e
rge-r
e
cursive: Have process_
e
ntry() ski
p
D
/F
o
r rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-r
e
cur
s
iv
e
: Ne
w
fu
n
ct
i
o
n to assist re
s
olving rena
m
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
merge-recu
r
sive: New da
t
a structure
s
for de
f
erring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newren
me
r
ge-recursive: Move process_entry's content merging
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e
-
recu
r
sive: Move del
e
te/modify handling into dedicate
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Ne
w
r
en
merge-re
c
ursive: Mov
e
r
e
name/dele
t
e handling
into dedicated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newr
e
n
mer
g
e-recursive:
Nuke rename/
d
irectory confli
c
t d
e
tectio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Rename c
o
nflict_rename_ren
a
me*() for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-
r
ecursi
v
e
:
Smal
l
code clarifi
c
a
t
i
on -
-
variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
t
6
036
:
A
dd
testca
s
e for
undetected confl
i
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
w
ren
t60
3
6: Add
a
second testcas
e
similar to t
h
e first but
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newr
e
n
t
6
036:
T
e
st index and worktree s
t
ate,
not ju
s
t that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
ren
t6020: A
d
d a testcase for
m
odify/d
e
lete + dir
e
ctor
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Newre
n
t60
2
0: Modernize st
y
le a bit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t
6
022:
A
dd tests for rename/rename c
o
mbine
d
with
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newren
t6022: Add
p
a
ired renam
e
+D/F confli
c
t:
(two/file, o
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
t6
0
22
:
Add tests
with both ren
a
me
sour
c
e & dest involved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add tests for
reve
r
s
i
ng
or
d
er of merges when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add te
s
t
c
omb
i
n
a
tion
s
of {co
n
tent c
o
n
f
lict?
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lija
h
Newr
e
n
t603
2
: Add a t
e
st
c
heck
i
ng for excessi
v
e output from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Junio C
H
amano
merge-recursive: Restructure show
i
ng how to chain more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Schalk, Ken
t3030:
A
dd a
t
estcase for
r
esolvable
r
ename/a
d
d
c
onflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Ju
n
i
o C Hamano
M
erge branch 'en/rename-d-
f
'
into
e
n/
m
erge-recursive
commit
|
commitdiff
|
tree
2010-09-18
Junio C Hamano
Git
1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-18
J
u
n
i
o
C Hamano
M
erge bran
c
h 'js/ls-files-x-
d
oc'
commit
|
commitdiff
|
tree
2010-09-17
Chri
s
Joh
n
sen
git-rebase--interactiv
e
.
sh: r
e
pl
a
c
e
cut with
$
{v%%
*
}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-17
Brandon Ca
s
ey
t
/
t
73
0
0
:
w
o
rkaround ancient touch
by rearr
a
nging arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-16
Junio C Hamano
Merge bran
c
h
'bg/fix-t7003'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Hamano
ls-f
i
le
s
documentatio
n
: r
e
wor
d
fo
r
co
n
sistenc
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-16
Jay Soffian
git-l
s
-f
i
les
.
t
xt: cla
r
ify -x/--exclude optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-15
Junio C Ham
a
no
Git 1
.
7
.
3 rc2
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'd
r
/
maint-ls-tree-pref
i
x-recursi
o
n-fix'
commit
|
commitdiff
|
tree
2010-09-15
J
u
ni
o
C Hamano
M
e
r
g
e b
r
anch
'os/fix-rebas
e
-diff-no-p
r
efix'
commit
|
commitdiff
|
tree
2010-09-15
Junio
C Hamano
Merge branch 'jl/fix-te
s
t
'
commit
|
commitdiff
|
tree
2010-09-15
J
u
nio
C Hamano
Merge branch
'
ch
/
f
ilter-branch-deprecate-rema
p
-
to-ancestor'
commit
|
commitdiff
|
tree
2010-09-15
Juni
o
C
Haman
o
Merge branch
'
c
h/maint-canno
t
-create-bund
l
e-error'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge
b
ranch 'ks/recursiv
e
-r
e
name-add-ide
n
tical'
commit
|
commitdiff
|
tree
2010-09-15
Junio C
H
a
mano
Merge git://
r
epo
.
or
.
cz/g
i
t
-
g
ui
commit
|
commitdiff
|
tree
2010-09-13
Brian
Gernhardt
t
7003: Use t
e
st_commit
i
n
ste
a
d of
c
usto
m
f
u
n
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-12
Junio C H
a
m
ano
ls-tree $di $dir:
d
o not mistakenly
recurse into directories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
Junio C Ha
m
ano
t310
1
: modernise sty
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
R
a
m
s
ay Jones
v
cs-svn: Fix some printf format compiler war
n
ings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-11
R
e
né Sc
h
ar
f
e
compat/nedmall
o
c: don't fo
r
ce NDEBUG on
t
he res
t
of git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Git
1
.
7
.
3 r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C
H
amano
Merge branch
'n
p
/relnotes-in-subdir
'
commit
|
commitdiff
|
tree
2010-09-10
J
u
nio C Hamano
P
repare f
o
r 1
.
7
.
3
r
c
1
commit
|
commitdiff
|
tree
2010-09-10
Junio C Ham
a
no
Merge branc
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2010-09-10
M
ark Lodato
config
.
txt: fix placeme
n
t of diff
.
nopr
e
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Bra
n
do
n
Ca
s
ey
t/t
4
018: avo
i
d two unnecessa
r
y sub-shell invocations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Mer
g
e
b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
t/t401
8
: test whether the w
o
rd_r
e
gex
p
atterns compile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
B
r
a
n
don
Casey
xdiff-i
n
terface
.
c
:
al
w
a
y
s tr
i
m trai
l
in
g
sp
a
ce from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
diff
.
c: call regfree to f
r
ee me
m
ory allocated by regcomp
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
t
/
t5510-fetc
h
.
sh: im
p
rove testing with explicit UR
L
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Bra
n
don Casey
builti
n
/fetch
.
c:
co
m
ment that b
r
anch->remot
e
_name i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
B
r
andon Casey
Mak
e
file: use co
m
p
at
r
e
gex on IRIX 6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon
C
asey
t/t7008:
w
orkarou
n
d b
r
oken handling of
\
000 by print
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Oded Shim
o
n
Add --src/ds
t
-prefix
t
o
git-formt-pat
c
h in git-rebase
.
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Elija
h
Newren
merge-recursive: D
/
F
conf
l
icts where
w
as_
a
_dir/f
i
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Elija
h
Newren
t3509: Ad
d
rename + D/F
conflic
t
tes
t
ca
s
e that recursi
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Junio C
Hamano
ins
t
all-webdoc: ke
e
p installed RelNotes-*
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jens Lehman
n
t1020: G
e
t rid of 'cd "$HERE"' at th
e
start o
f
each
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan N
i
eder
t2016
(
checkout -p): add
m
issing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
J
o
nath
a
n Nieder
t1302 (core
.
repo
s
itoryversion
)
: style
t
weaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nied
e
r
t2105 (git
f
i
le): add missing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan
Niede
r
t1450 (fsck)
:
re
m
ove d
a
ngling object
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonath
a
n
N
ie
d
e
r
tests: subshell indentation stylefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Mer
g
e branch 'tf
/
cle
a
nup-
b
u
iltin-help
-
headers
'
commit
|
commitdiff
|
tree
2010-09-08
Junio
C Hamano
Merge branch 'jk/
t
est-
m
ust-fai
l
-missing'
commit
|
commitdiff
|
tree
2010-09-08
J
u
nio C Hamano
Merge branc
h
'
j
h/error-removing-
m
issin
g
-
n
o
t
e'
commit
|
commitdiff
|
tree
2010-09-08
J
u
nio C Hamano
Mer
g
e branch
'
k
f/askpass-config
'
commit
|
commitdiff
|
tree
2010-09-08
Ju
n
io C Ham
a
no
Mer
g
e br
a
nch
'
bc/maint-fetch
-
url-only'
commit
|
commitdiff
|
tree
2010-09-08
Junio C
H
amano
Me
r
g
e br
a
nch 'j
k
/ma
i
n
t
-pass-c-config-in-env'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge b
r
anch
'
en/d-f-con
f
lict-fix'
commit
|
commitdiff
|
tree
2010-09-08
Joh
a
nnes Sixt
fast-export: ensure that a renam
e
d file is printed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Nico
l
as Pitre
Do
c
u
mentation:
m
o
v
e RelN
o
tes into a directory
of thei
r
ow
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
J
u
n
io C Ha
m
ano
Mer
g
e
b
r
a
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2010-09-07
El
i
jah
Newren
reve
r
t: Fix
t
r
ivial
commen
t
sty
l
e
i
ssue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
cache_tree_free:
F
ix small memory lea
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio
C
Haman
o
Merge b
r
anch 'jh/clean-exc
l
ud
e
'
commit
|
commitdiff
|
tree
2010-09-06
Thiago Farina
builtin
/
c
l
ean
.
c: Us
e
STRING_LIS
T
_I
N
IT_
N
OD
U
P
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Ju
n
i
o C Hamano
Merge br
a
nch
'
jl
/
ma
i
n
t-fix-
t
e
s
t'
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
Several tests: c
d
inside s
u
bshe
l
l instead of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
J
e
n
s Leh
m
ann
t3404
&
t
7508: cd inside sub
s
h
e
ll instead of
around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge
b
r
a
nch
'
maint'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge b
r
anch 'xx/t
r
ivial' into maint
commit
|
commitdiff
|
tree
2010-09-06
J
u
nio C
H
a
m
a
n
o
ta
g
.
c: whitespac
e
breakages
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jared Ha
n
ce
Fix whitespace issue in object
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
J
e
ns Lehma
n
n
t550
5
: add missing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge bran
c
h 'jl
/
submodule-i
g
n
o
re-diff'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Mer
g
e
branc
h
'ab/test-2'
commit
|
commitdiff
|
tree
2010-09-04
Junio C
H
a
m
a
n
o
Mer
g
e bra
n
c
h 'j
s
/det
a
ched-stash
'
commit
|
commitdiff
|
tree
next