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
handle_delete_modify(): Check whether D/F conflicts are still present
2010-09-30
Elijah Newr
e
n
handle_d
e
lete_mod
i
f
y(): Check whether D/F conflict
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah
N
ewr
e
n
me
r
ge_content(): Check wh
e
ther
D
/F conflicts are still
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
confli
c
t_rename_ren
a
me_1to2(): Fix
c
hecks
f
or pr
e
s
ence
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
confl
i
ct_r
e
name_delete()
:
Check
whether D/F conf
l
icts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Dela
y
modify/delete co
n
flicts if
D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merge-recursiv
e
: Delay
c
on
t
en
t
m
erging for rena
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah New
r
e
n
merg
e
-recursive: Delay
h
andl
i
ng of renam
e
/delete conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
m
erge-recu
r
si
v
e
: Mo
v
e handling of d
o
uble
rename of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recurs
i
ve:
Move ha
n
dlin
g
of do
u
ble
r
e
name
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newr
e
n
m
erge-recurs
i
ve: Avoid doubly me
r
ging r
e
name
/
add conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
me
r
ge-rec
u
rsiv
e
: Upd
a
te merge
_
c
o
nten
t
(
)
ca
l
l signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recur
s
ive: Update
c
onflict_rename_rena
m
e_1to2
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e-recursive
:
S
t
ru
c
t
ure
process_df_en
t
ry() t
o
han
d
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
me
r
g
e-
r
ec
u
rsive: Ha
v
e proce
s
s_entry() skip D/F o
r
rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Newren
merge-recursive
:
New
f
unction to assist resol
v
i
n
g renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
me
r
ge-recur
s
ive
:
New data structures
for deferrin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
li
j
ah Newr
e
n
merge-recur
s
i
v
e: Mov
e
pr
o
ces
s
_ent
r
y's c
o
n
t
e
n
t merg
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e-
r
ecurs
i
ve
:
Mo
v
e
delete/
m
odify handling into ded
i
cated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h N
e
wren
me
r
g
e-recursive: Move
r
en
a
m
e
/delete hand
l
i
n
g into
d
e
dicated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
me
r
ge-recur
s
ive: Nuke rena
m
e
/
direct
o
r
y
conflict detection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Ne
w
ren
merge-recur
s
iv
e
:
R
ename conflict_rename_rename*() for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursiv
e
: Small cod
e
clarificat
i
on -
-
variable
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6
0
36: Add testcase
f
or undetected con
f
lict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t
6036:
Add
a second
t
e
s
tcase sim
i
l
a
r to the first but
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036:
Test
index
and
w
orktree stat
e
, not
j
ust
t
hat
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Ne
w
re
n
t6020:
Ad
d
a
testcase for m
o
dify
/
delete + directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h New
r
en
t60
2
0: Modernize style a
b
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h N
e
wren
t6022:
A
d
d
tests
f
or re
n
am
e
/rename co
m
bined with D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
i
j
ah N
e
wren
t
6
0
22: Add paired re
n
ame+D/F con
f
lic
t
:
(
two/file, one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah New
r
en
t6022:
A
dd tests with both rename source
&
d
est invol
v
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add te
s
ts for
r
ever
s
ing
o
rd
e
r of mer
g
es when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ija
h
Newren
t6022: Ad
d
test combinations of {content con
f
lict?
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
ewren
t60
3
2: Add a
t
e
s
t checking for excessive output from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Junio C H
a
m
ano
merge-recursive:
R
estructur
e
showing how to chain more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Schalk, Ken
t3030: A
d
d a testcase fo
r
resol
v
able r
e
name/add conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Junio
C H
a
man
o
Merge branch 'en/re
n
ame-d-f' into
en/mer
g
e-
r
ecursive
commit
|
commitdiff
|
tree
2010-09-18
Ju
n
io C Ham
a
no
Git 1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-18
Junio C Ham
a
no
Merge branch 'js/ls-files-x
-
d
o
c'
commit
|
commitdiff
|
tree
2010-09-17
Ch
r
i
s
J
oh
n
sen
git-re
b
ase--int
e
ractive
.
sh: re
p
lace cut with
${
v
%% *}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-17
Brand
o
n
C
asey
t/t730
0
:
w
orkaround ancient touc
h
by re
a
rran
g
i
n
g
arguments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-16
Junio
C H
a
mano
M
e
rge branch 'bg/fix-t7003'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Hama
n
o
l
s-files documen
t
ation: reword fo
r
consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-16
Jay Soffia
n
gi
t
-ls-files
.
txt: clarify -x/--e
x
clude opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-15
J
unio
C Hamano
Git 1
.
7
.
3 rc2
commit
|
commitdiff
|
tree
2010-09-15
J
u
nio
C
Hamano
Mer
g
e bran
c
h 'dr/maint-ls-tree-prefix-r
e
cursi
o
n-fix'
commit
|
commitdiff
|
tree
2010-09-15
J
unio C
Ha
m
ano
Merge branc
h
'os/fi
x
-rebase-di
f
f-no
-
p
r
efix'
commit
|
commitdiff
|
tree
2010-09-15
J
unio C Hamano
Merge br
a
nch
'
jl/fix-tes
t
'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Haman
o
Merg
e
branch
'
ch/filter-bran
c
h-de
p
recate-remap-to-ancestor'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Me
r
ge branch 'ch/maint-cannot-create-bundle-error'
commit
|
commitdiff
|
tree
2010-09-15
J
u
nio C
H
ama
n
o
Merge b
r
anch
'
k
s
/re
c
ursive-rename-add-identical
'
commit
|
commitdiff
|
tree
2010-09-15
Junio
C Hamano
Merge git
:
//repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2010-09-13
Brian Gernh
a
r
d
t
t70
0
3: Use test_co
m
m
i
t
instead of custom f
u
nction
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
J
u
ni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-12
J
unio C
Hamano
ls-t
r
e
e $di
$
di
r
:
do no
t
mistakenly
r
ecurse
into directories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
Junio C Hamano
t3101
:
moder
n
ise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
Ramsay Jones
vcs-svn: F
i
x some p
r
intf fo
r
mat compi
l
er warnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-11
R
e
n
é
S
charfe
compat/nedmal
l
o
c: don'
t
force NDEBUG on the rest of git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
G
it 1
.
7
.
3 rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio
C
Hamano
Merge branch 'np/relnotes-in-subdir'
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hama
n
o
Pr
e
pa
r
e for 1
.
7
.
3
r
c1
commit
|
commitdiff
|
tree
2010-09-10
Jun
i
o C Hamano
Merge b
r
a
n
ch
'maint'
commit
|
commitdiff
|
tree
2010-09-10
M
ark Lodato
config
.
t
x
t
:
fix placement of
diff
.
noprefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
t
/t4018: avoid t
w
o
unnece
s
sar
y
sub-shell invocations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Ham
a
n
o
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-09-10
Brandon
Casey
t/t4018:
test whether th
e
word_rege
x
pattern
s
compile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon
C
asey
xdiff-interface
.
c:
a
l
way
s
trim tra
i
li
n
g
s
pace 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 memory allocated by regco
m
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brand
o
n
C
ase
y
t/
t
5510-fetch
.
sh: improve testi
n
g w
i
th expli
c
it URL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brando
n
Ca
s
ey
bui
l
tin/fetch
.
c
:
c
o
mm
e
nt that
b
ran
c
h
-
>
remo
t
e_name is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
Mak
e
file:
u
se com
p
at
reg
e
x on I
R
IX 6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
t/t7008: workaround broken handl
i
ng of \
0
00 by printf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Oded Shimon
Add
-
-
s
r
c/dst-prefi
x
t
o git-formt-patch in
git-re
b
ase
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Elijah
Newren
merge-recursive: D/F conflicts where was_a
_
dir/file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Elij
a
h
Newren
t
3
50
9
: A
d
d ren
a
m
e
+
D
/
F
c
onflict testcase
tha
t
re
c
ursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jun
i
o C Hamano
install-
w
ebdoc
:
k
e
e
p
i
nstalled RelNotes-*
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jens Lehmann
t1020: Get rid
of 'cd "$
H
ERE"' at the start of each
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nied
e
r
t2016 (checkout -p):
a
dd missing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Ni
e
der
t
1
302 (core
.
re
p
osito
r
yversion): style twe
a
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jon
a
than Nieder
t2105 (gitfile):
a
dd
m
issing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Ni
e
der
t1450 (fsck): r
e
move danglin
g
objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jo
n
athan Nieder
t
ests: subshell i
n
d
entation
stylefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-08
Junio C H
a
mano
Merg
e
branch
'
tf/cleanup
-
builtin-help-head
e
rs'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Ham
a
no
Merge branch 'jk/
t
e
st-mu
s
t-fail-mis
s
ing'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge
branc
h
'jh/err
o
r
-r
e
m
oving
-
mis
s
ing-note'
commit
|
commitdiff
|
tree
2010-09-08
Juni
o
C Hamano
Merge branch 'kf/askpass-c
o
nfig'
commit
|
commitdiff
|
tree
2010-09-08
Juni
o
C
H
amano
Me
r
ge branch 'bc/m
a
int-fetch-url-on
l
y'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch
'jk/main
t
-pass
-
c-config-i
n
-env'
commit
|
commitdiff
|
tree
2010-09-08
Junio
C
Haman
o
Merge b
r
anch '
e
n/d-f-conflic
t
-fix
'
commit
|
commitdiff
|
tree
2010-09-08
Johann
e
s Sixt
fas
t
-export: en
s
ure that a renamed file i
s
pr
i
nted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
N
i
colas Pitre
Documentation: move Rel
N
otes
i
nto a directory of their own
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-07
Elij
a
h
Newren
r
evert: Fix trivial co
m
m
e
n
t style issue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah N
e
wren
c
a
ch
e
_t
r
ee_free: Fi
x
small memor
y
leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio
C
Hamano
Merge branch 'jh/clean-exclude'
commit
|
commitdiff
|
tree
2010-09-06
Thiago
Far
i
na
b
u
i
ltin/clean
.
c: Use STR
I
NG_LIST_INIT_NODUP
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio
C
Hamano
Merge branch 'jl/maint-fix-te
s
t'
commit
|
commitdiff
|
tree
2010-09-06
Je
n
s Lehmann
Seve
r
al te
s
ts: cd in
s
ide subshell instea
d
of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
t3404 & t75
0
8: cd
inside subsh
e
l
l in
s
tead of
a
r
o
u
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio C
H
am
a
no
Merge b
r
an
c
h 'ma
i
nt
'
commit
|
commitdiff
|
tree
2010-09-06
Junio C
H
amano
Merge branc
h
'
x
x
/trivi
a
l
'
into maint
commit
|
commitdiff
|
tree
next