repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Fix working copy handling for rename/rename/add/add
2011-08-14
El
i
j
ah Newren
merge-re
c
ursi
v
e: F
i
x wo
r
k
i
ng c
o
py
h
an
d
l
in
g
fo
r
rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
ur
s
ive
:
add
h
andling for rename/rename
/
add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
er
g
e-recur
s
ive: Ha
v
e
co
n
flict_rename_delete reuse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah New
r
en
merge-re
c
ursive: M
a
ke modify/delete handling code
r
eus
a
ble
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
mer
g
e-rec
u
rsi
v
e: Consider mo
d
ifications in
r
e
name/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recursi
v
e: Create
f
unction
f
or
m
erging
w
ith branchname
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Re
c
ord
more data n
e
ed
e
d f
o
r m
e
rging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: D
e
f
e
r
rena
m
e/rename(2to1) handling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: Small clean
u
ps for conflict
_
r
ename_rename_1to2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-recurs
i
ve:
Fix
r
ename
/
ren
a
me
(
1t
o
2) res
o
l
u
tion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-r
e
cursive: Introdu
c
e a me
r
ge_file conv
e
nience
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
mer
g
e-recursive:
F
ix modify/dele
t
e resolution
in the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: W
h
en we det
e
ct we can
s
k
i
p an
update
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
m
erge-recursive
:
Provide
more info in conflict markers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merg
e
-r
e
cursive:
C
le
a
nup
a
nd
c
o
n
so
l
idation of rename_conflic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
m
e
rge-recursive: Consoli
d
ate pr
o
cess_entry()
and process_df
_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive
:
I
m
prove hand
l
ing of ren
a
m
e
t
arget
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newr
e
n
merge-recursive: Add
c
o
m
men
t
s abo
u
t h
a
n
d
ling r
e
name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
merge-r
e
c
ursive:
Make dead code
for ren
a
me/rename(2to1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
merge-r
e
cursive: Fi
x
dele
t
i
o
n
of untracked fi
l
e in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-r
e
curs
i
v
e: Split update
_
stages_and_
e
n
t
ry; only
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recursive: Allow make_room_for_path() to
rem
o
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Johan
n
es Sixt
st
r
ing
-
list: A
d
d API to rem
o
ve an it
e
m from an unsorted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-r
e
c
ursive: Split was_track
e
d
()
o
ut
of woul
d
_
l
ose_
u
ntra
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Newren
merge
-
recursive: Save D/F conflict filenames instead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Ne
w
ren
merge-recursive
:
Fix c
o
de c
h
eckin
g
for
D/F confli
c
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-
r
ec
u
rsive: Fix so
r
ti
n
g order
a
nd direc
t
ory change
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
m
erge-recursive: Fix recursive case with D/F
c
o
n
flict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
wren
merge
-
recursive: A
v
oid wor
k
ing
d
i
r
ectory changes du
r
in
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
e
n
merge-recursive: Remember to free gen
e
rated unique
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-r
e
cursive: Consolidate different
u
pd
a
te_stag
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge-
r
ecursive: Ma
r
k s
o
me diff_filespec struct
a
r
g
u
ments
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h N
e
wre
n
merge-recursive: Corr
e
ct a co
m
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
merge
-
recursive
:
Make BUG messa
g
e more legible by adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
22: Add
t
estcase for merging a
r
ena
m
ed file with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6022: New tests
checki
n
g for unnecessary
u
pdates o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6022:
Rem
o
ve unnecessary untrack
e
d files
t
o ma
k
e test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cr
o
ss
+ rename/ren
a
me(1to2)/add-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6036:
c
riss-cross w/ r
e
name/rename
(
1to2)/
m
o
d
if
y
+rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah Newren
t
6
0
3
6
: tests for criss-cros
s
mer
g
e
s
w
ith variou
s
directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
t6036: cri
s
s
-cros
s
with weird c
o
ntent
can fool git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
Ne
w
ren
t60
3
6
:
A
d
d
differently resolved modif
y
/delete c
o
nflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newr
e
n
t6
0
4
2
: Add
f
a
iling testca
s
es fo
r
rename/rename/ad
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042: Ensure
r
ename/renam
e
conflicts leav
e
ind
e
x and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newren
t60
4
2: A
d
d tests for c
o
ntent issues with mod
i
fy/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah New
r
en
t6042: A
d
d a testcase where
u
ndetected rename cau
s
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
t6042: Add a pair of
c
ases where undetecte
d
renames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6042: Ad
d
failing
testcase for re
n
ame/modify
/
add-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newre
n
t6042: Add a testcase w
h
er
e
git dele
t
es a
n
untracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
J
i
m Mey
e
r
ing
fetch: do not leak a refs
p
ec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ham
a
n
o
Git 1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge b
r
anch 'jk/main
t
-conf
i
g-alias-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
amano
Merge branch 'jc/fmt
-
req
-
f
ix'
int
o
maint
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C
Hamano
Mer
g
e b
r
anch 'j
k
/maint-docs' into ma
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Junio C
Hamano
Mer
g
e
bran
c
h 'jn/doc-r
e
m
ote
-
h
e
l
pers' into ma
i
nt
commit
|
commitdiff
|
tree
2011-06-01
J
u
n
i
o C Haman
o
Merge br
a
nc
h
'kk/
m
aint-prefix-in-config-ma
k
'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Jim Meye
r
i
n
g
di
f
fcore-re
n
ame
.
c: avoid set-but-n
o
t-used wa
r
ning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Ha
m
ano
Star
t
1
.
7
.
5
.
4 draft release not
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Hamano
Merge br
a
nch 'tr/a
d
d-i-no-escape' into m
a
int
commit
|
commitdiff
|
tree
2011-05-31
J
unio
C Hamano
Merge branch
'
vh/confi
g
-intera
c
t
i
ve-singlekey-
d
oc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
ma
n
o
Merge branch 'ml
/
t
es
t
-readme' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hama
n
o
M
e
r
g
e branch '
a
b/i1
8
n-fixup
'
int
o
main
t
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C
Hamano
Merge branch 'jc/
r
e
name-degra
d
e-cc-t
o
-c' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
aman
o
M
e
rge branch 'rr/doc-c
o
ntent-type' into
maint
commit
|
commitdiff
|
tree
2011-05-30
Jonat
h
an Nieder
D
o
c
umenta
t
ion: do not misinterpret
re
f
specs as bol
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
no
M
e
rge branch '
j
m/maint-misc-fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C Hamano
Merge b
r
anch
'bc/mai
n
t-sub
m
odu
l
e-f
i
x-park
e
d'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C Hamano
M
e
rge
b
r
a
nch 'bc/maint-
a
pi
-
doc-parked' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
erge branch 'jn/ru
n
-comm
a
n
d
-e
r
ro
r
-failure'
into
m
a
int
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
config
.
mak
.
in: allow "
c
onfigure --sysconfdir=/el
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f
K
i
ng
docs: fi
x
some
a
nti
q
ue e
x
ample o
u
tput
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: make sure literal "->" isn
'
t conve
r
ted to arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: update status --
p
orcel
a
in
f
or
m
at
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: minor gramma
r
fixes to gi
t
-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Bran
d
on Casey
gi
t
-submodule
.
sh: separate
p
ar
e
n
s
by a space
to avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon
C
asey
D
o
cumen
t
a
t
ion/techni
c
al/api-diff
.
txt: correct n
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
K
ing
rea
d
_gitfi
l
e
_
g
e
nt
l
y
: use s
s
ize_t to hold read r
e
sult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Ji
m
Meyerin
g
remove tests of
a
l
way
s
-false c
o
ndition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Ji
m
Meyering
rere
r
e
.
c:
diagn
o
s
e
a
corrup
t
MERGE_RR wh
e
n hi
t
ti
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Git
1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Me
r
ge br
a
nch 'm
a
int-1
.
7
.
4' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
M
e
r
ge branc
h
'jk/git-c
o
nnection-deadlock-
f
ix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merg
e
branc
h
'
js
/
maint-
s
e
nd-pack-stateless-rpc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
H
amano
Merge branch 'jk/main
t
-upload
-
pack-
s
hallow' into ma
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C H
a
mano
Merg
e
branch 'j
m
/maint-diff-words-with-sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C
Ham
a
n
o
Merge b
r
anch 'kk/maint-p
r
efix
-
in-config
-
mak
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
ma
n
o
Merge branc
h
'mg/diff-uiconfig-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C
Haman
o
Merge br
a
nch 'ft/gitweb-tar-with-gz
i
p-n' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e branch
'
s
s
/
doc-svn' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Mer
g
e branch 'jn/f
o
rm
a
t-p
a
tch-doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merge branch 'jc/ma
i
nt-pathspec-stdin-and-cmdl
i
ne'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge br
a
nch 'jk/cherry-pick-root-with-r
e
sol
v
e' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
a
m
a
n
o
Merge br
a
n
ch
'
r
g
/copy-gecos
-
user
n
ame' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
m
ano
Merge branch 'f
c
/completio
n
-
zsh' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
a
m
ano
M
e
rge branch 'jk/git-connection-dead
l
ock
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bra
n
ch 'js/maint-send-p
a
c
k
-
st
a
teles
s
-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge branch 'svn
-
fe-maint'
o
f git:/
/
repo
.
o
r
.
cz/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Hamano
userformat_f
i
n
d
_requirements():
f
i
n
d requi
r
emen
t
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
N
guyen Thai Ngoc Duy
init/clone: remo
v
e
s
hort o
p
tion
-L an
d
document --sep
a
rate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
J
unio C Hamano
ha
n
dle_o
p
tions(): do
n
ot miscou
n
t ho
w
many arguments
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next