repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: Don't re-sort a list whose order we depend upon
2011-08-14
Elijah Ne
w
re
n
merg
e
-r
e
cursive
:
Don't re
-
sort a list w
h
ose order we
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
recursive: Fix
v
irt
u
al merge base for rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6036
:
criss-cro
s
s
+ rename/ren
a
me(1to2)/add-
d
est
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah New
r
e
n
merge-recursive: Avoid unnecessary
f
ile r
e
writes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
w
r
e
n
t6022: Additional tes
t
s
checking for unnecessa
r
y update
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
me
r
ge-recursive
:
Fix
s
pur
i
ous 'refusing to lose u
n
trac
k
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Add testcase for spurious "refusing t
o
lose
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Jeff King
t3030:
f
ix
a
ccidental suc
c
es
s
i
n
sy
m
link rename
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-
r
ecursive: Fix
w
o
rkin
g
copy ha
n
dling for rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lija
h
Newren
m
e
rge-
r
ecursive:
add han
d
lin
g
for rename/rename/add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewre
n
m
e
rge-recursive: Have conflict
_
r
e
n
ame_
d
e
l
ete reuse
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
merge-recursive:
M
ake modify/delete ha
n
dling
code reusable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge-recursive: Consi
d
er modi
f
ications in re
n
ame/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
re
c
u
r
s
ive: Cr
e
a
t
e
f
un
c
tion
f
or merging with br
a
n
chname
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-recursi
v
e: R
e
cord m
o
re data
ne
e
d
ed for mergin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
me
r
ge-re
c
ursive: Defer
r
e
name/rename(2to1) handling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah N
e
w
r
en
me
r
g
e
-
r
ecursive: Small cleanups for conflict_re
n
ame_r
e
n
a
me_1to2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
me
r
ge-
r
ecu
r
sive: Fix r
e
name/re
n
ame(1to
2
)
r
es
o
l
u
tion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-re
c
ursive: Introd
u
ce a m
e
rge_file convenience
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newr
e
n
merge-re
c
u
rsiv
e
: Fix modify/delete resolution in
t
he
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge
-
r
e
c
ursive
:
When
w
e
detect w
e
c
a
n skip
an up
d
ate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wre
n
merge-r
e
cursive:
Provide more in
f
o i
n
conflic
t
marker
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
merge-re
c
ursive: Cle
a
nup and co
n
sol
i
d
a
tion of rename_conflic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recursive:
C
onsol
i
date process_entry() and process_df_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merg
e
-
r
ecursive: Improve handling of rename target
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
m
e
r
ge-recur
s
ive: Add
co
m
ments abou
t
h
and
l
i
n
g rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newren
merge
-
re
c
ur
s
i
v
e: Make d
e
ad c
o
de for
r
en
a
me/rename(2to1
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newr
e
n
m
erge-re
c
ur
s
ive: Fi
x
deleti
o
n
o
f
u
ntracked file
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ew
r
en
m
erge
-
recursive: Split
updat
e
_stage
s
_and
_
e
ntry; only
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
m
e
rge-recursive: Allo
w
m
a
ke_room_fo
r
_
p
ath
(
)
to
re
m
ove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Johannes Sixt
string-list:
Add API t
o
rem
o
ve
a
n item fro
m
a
n
un
s
orted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recurs
i
ve: Split was_track
e
d
() out of would
_
l
ose_untra
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-r
e
cursive: Save D/F co
n
flict filenames i
n
stead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
m
e
rg
e
-rec
u
rsive: Fix code
checki
n
g for
D/F
c
onfl
i
cts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-re
c
ursive: Fix sorting order and
d
irector
y
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
Eli
j
ah N
e
wren
merge
-
r
ecursive:
F
ix recursive case w
i
th D/F conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
m
e
rge-rec
u
rsive: Avoid
working directory chan
g
e
s
dur
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
en
me
r
ge-recursiv
e
: Remembe
r
to free generated unique
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
wren
merge-recu
r
s
i
ve:
Con
s
olidate
different update_sta
g
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah
Newren
merge-recursive
:
Mark
some diff_filespec struc
t
arg
u
ments
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
m
erge-rec
u
rsive: Correct a
c
omm
e
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-r
e
c
u
rsive
:
Make
B
UG message
m
ore legible by adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Ne
w
ren
t6022: Add
t
estca
s
e fo
r
mergi
n
g a ren
a
med fi
l
e with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t60
2
2:
N
ew tests ch
e
cking for u
n
necess
a
ry updates
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6
0
22: Remove unnecessa
r
y
un
t
racked files to make te
s
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6036: criss-cross + re
n
ame/rename(1to2)/
a
dd-so
u
rc
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
N
e
wren
t6036
:
c
riss-cross w/ rename/rename(1to2)
/
modify+rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: tes
t
s for criss-cros
s
m
e
rges with vari
o
u
s
directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
36: criss-cros
s
with
w
eird content can fo
o
l git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6036: Add diffe
r
ent
l
y resolved modify/delete
conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
ja
h
Newren
t60
4
2:
A
dd
failing
t
estc
a
ses
for renam
e
/
ren
a
me/ad
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t
6042: Ensure
rename/
r
ename conflicts leave index and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t
6
0
4
2: Ad
d
t
ests for co
n
tent issues with modify/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t
6
042: Add a t
e
stcase where
und
e
t
e
ct
e
d rename cause
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042:
Add a pair of cases w
h
er
e
undetected rename
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add faili
n
g
tes
t
c
a
se for rename/modify/add-s
o
urce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t604
2
:
A
dd a t
e
stca
s
e where git
delet
e
s an untracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
J
i
m Me
y
e
r
ing
fetc
h
: do no
t
leak
a refspec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Git 1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C Hamano
Mer
g
e
branc
h
'jk/ma
i
n
t
-
c
onf
i
g-alia
s
-fix'
i
nto maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Me
r
ge branch 'jc/f
m
t-req-fi
x
' into
maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
b
r
a
nch 'jk/maint-docs'
i
nto maint
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o
C Ham
a
n
o
Merge
b
r
anch 'jn/doc-remote-helpers
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch
'
k
k/maint-prefix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
im Meyering
d
i
f
fcore-rename
.
c: avoi
d
set
-
but-not-u
s
ed warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Hamano
St
a
rt 1
.
7
.
5
.
4 d
r
aft release
notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
ano
Merge branch
'tr/add-i-n
o
-escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
amano
Me
r
ge b
r
anch
'
v
h/config-interactive-s
i
nglekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
M
erg
e
branch
'ml
/
test-re
a
dme' into maint
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hamano
Merge branch 'a
b
/i18n-fixup' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Merge branch 'jc/ren
a
me-degrade-cc-to-c' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Hamano
Merge branch
'
rr/doc-c
o
ntent-type'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-30
J
o
natha
n
N
i
eder
Doc
u
mentation: d
o
n
ot mis
i
nterpre
t
refspecs
a
s bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
n
o
Merge
b
ranch 'jm/m
a
int-
m
isc-fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C Hama
n
o
Me
r
ge b
r
anch 'bc/m
a
int-sub
m
odule-
f
ix-parked' in
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Hamano
Me
r
ge branch 'bc/ma
i
nt-ap
i
-
d
oc-parked' into maint
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io
C
Hamano
Merge branch 'jn/run-command-error-fail
u
r
e
' into maint
commit
|
commitdiff
|
tree
2011-05-27
Juni
o
C Hamano
confi
g
.
mak
.
in: allow "configure --sysc
o
nfdir=/else
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: fix some an
t
ique exampl
e
o
utput
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
Ki
n
g
docs
:
make sure li
t
er
a
l "->" isn't converted t
o
arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
J
eff K
i
ng
docs:
u
pdate
status --porcel
a
in
f
ormat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: minor grammar fixes
to git-statu
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Br
a
ndon Casey
git-subm
o
dule
.
s
h: se
p
a
r
at
e
pa
r
ens by a spa
c
e to avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Bran
d
on Casey
Documentation/tec
h
nic
a
l/api-d
i
ff
.
txt: correct
name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_gitfi
l
e_gently
:
use ssize_
t
to
h
ol
d
r
ead res
u
lt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remove tests o
f
always-false condition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m Meyering
re
r
ere
.
c:
d
i
a
gnose a
c
orrupt M
E
RGE_RR
w
he
n
hi
t
ting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
G
it 1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o C Hamano
Me
r
g
e branch 'm
a
int-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merg
e
branch 'j
k
/git-con
n
ection-d
e
adlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Haman
o
M
e
r
ge branch 'js/ma
i
nt-send-pac
k
-state
l
ess-
r
pc-dea
d
lock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merge br
a
nch 'jk/maint-upload-pa
c
k-shallow' into main
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
M
erge
b
ranch 'jm/maint-diff-words-wi
t
h
-sbe' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch 'kk/ma
i
nt
-
p
r
e
f
i
x-in-confi
g
-mak' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'mg/diff-u
i
conf
i
g-d
o
c' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Ham
a
no
Merge branch 'ft/gitweb-t
a
r-
w
it
h
-gzip-n' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
Ham
a
n
o
Me
r
ge branch 'ss/d
o
c-svn' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e
branch
'jn/format-
p
at
c
h
-
d
oc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
M
e
rge branch
'jc/maint-pathspe
c
-
s
tdi
n
-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge
b
r
a
nch
'
jk/c
h
e
rry-pick-root-wit
h
-resolve' in
t
o
.
.
.
commit
|
commitdiff
|
tree
next