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: Split was_tracked() out of would_lose_untracked()
2011-08-14
E
l
ijah Ne
w
ren
merge-recu
r
s
i
ve: Split
was_tracked() o
u
t
o
f w
o
uld_lose_un
t
ra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewre
n
merge-recursive: S
a
ve D/F
c
o
n
fl
i
c
t f
i
lenames
inste
a
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
m
e
rge-recu
r
sive:
Fix c
o
de
c
hecking
f
or
D
/F conf
l
i
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merge
-
recursive: Fix sorting
o
rder
a
n
d dire
c
tory chang
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
merg
e
-recursive: Fix
r
e
c
u
rsive case wi
t
h
D
/F c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
merge-recursive: Avoid w
o
rking direc
t
ory
changes
during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
me
r
ge-recurs
i
v
e: Rem
e
mber to
f
ree generated unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Consolidate di
f
f
e
rent update_stage
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
merg
e
-re
c
ursive: Mark s
o
me diff_
f
iles
p
ec struct argument
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: C
o
rrect a comme
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
merge
-
r
e
cursive: Mak
e
BUG message more legible
b
y addin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6022: Add t
e
stcase
for merging a renamed fi
l
e wi
t
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t
6
022: New tes
t
s chec
k
ing for
u
nnecessary updates of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wren
t6022: Remo
v
e unnecessary untracked
f
iles to make t
e
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cross +
re
n
ame/ren
a
m
e(1to2)/add-
s
ource
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
036
:
cri
s
s-cross w/ rename/rena
m
e
(1
t
o2)/modif
y
+rena
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6036:
t
e
sts for
c
r
i
s
s-cross mer
g
e
s
with
v
ar
i
ous directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
036: criss-c
r
oss w
i
th weird co
n
te
n
t can f
o
o
l gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
t6036: Add d
i
fferently r
e
solved modify/delete confl
i
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
t6042: Add f
a
i
l
in
g
t
e
stcases for rename/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
ewre
n
t6
0
42: Ensure ren
a
m
e/rename con
f
licts
leave index
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add tests for
c
o
ntent issues with
m
o
di
f
y/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newr
e
n
t604
2
: Add
a
t
e
stcase where und
e
tected rena
m
e cau
s
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t
6042: Add a pair of cases whe
r
e undetected
rename
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6042: Add failing testcase for ren
a
me/mod
i
fy/ad
d
-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042
:
Add a testcase where git dele
t
e
s
an
u
ntr
a
cked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Ji
m
M
e
yering
fetch: do
n
ot le
a
k a refspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
J
u
n
i
o
C Hama
n
o
Gi
t
1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branc
h
'jk/maint-config-al
i
as
-
fix' int
o
maint
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
io C Hamano
Merg
e
b
ranch 'jc/f
m
t
-
req-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C H
a
m
a
no
Merge branch 'jk/
m
a
i
nt-docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Ha
m
ano
Mer
g
e
b
ranch 'j
n
/
d
oc-remote-
h
elpers
'
i
nt
o
main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hama
n
o
Merg
e
branch
'
kk/m
a
int-prefix-
i
n-confi
g
-mak' into
maint
commit
|
commitdiff
|
tree
2011-06-01
Jim
M
e
y
ering
dif
f
c
o
re-re
n
ame
.
c: avoid set-but
-
not-use
d
warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
S
t
art 1
.
7
.
5
.
4
d
raft release
note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'tr/a
d
d-i
-
no-escape' into
maint
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C
H
amano
Merge bra
n
ch '
v
h
/
config-interactive-sing
l
ek
e
y-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io
C Hamano
M
e
r
ge branch 'ml/test-readm
e
' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch
'ab/i18n-fixup' into maint
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hamano
Me
r
ge
b
ran
c
h 'jc/rename
-
d
egrade-cc-to-c'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Hamano
Merge b
r
a
nch 'rr/doc-con
t
ent-type'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-30
J
o
n
at
h
a
n
N
ieder
D
o
c
u
me
n
tation:
do not misinterpret
refsp
e
cs as bo
l
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Hama
n
o
Merge
bra
n
ch 'jm/
m
aint
-
mi
s
c-fix'
into
m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Junio C
H
aman
o
Mer
g
e
b
ran
c
h 'bc/main
t
-
s
u
b
module-
f
ix-parked
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C Hamano
Mer
g
e b
r
anch 'bc/ma
i
n
t
-a
p
i
-
doc-parked' int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C Hamano
Merge
b
ranch 'j
n
/run-c
o
mma
n
d
-
er
r
or-fail
u
re' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-27
Junio
C
Hamano
config
.
m
ak
.
i
n:
all
o
w
"confi
g
ure --sysc
o
nfdi
r
=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f King
docs: fix some anti
q
u
e
e
xample output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
i
n
g
docs: make sure literal "->" isn't converted to
arrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
do
c
s:
u
pdate status --po
r
celain format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f King
docs: min
o
r grammar
f
ixes to git-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
g
it-submod
u
le
.
sh: sep
a
rate p
a
re
n
s
by a space to avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon
Casey
Documentation/technical/api-diff
.
txt
:
c
orrect name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff Kin
g
read_gitfile_gently: use ssize_
t
to h
o
ld read resul
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Mey
e
r
i
ng
remove tests of always-f
a
lse c
o
ndition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m
Meyering
rerere
.
c: diagnose a corrupt
M
ERGE
_
RR when hi
t
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
M
e
r
g
e branch 'ma
i
nt-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e b
r
anch
'jk/git-connectio
n
-deadl
o
ck-fi
x
' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Me
r
ge b
r
a
nch 'j
s
/maint-send-pack-stateless-rpc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merge b
r
anc
h
'jk/ma
i
nt-u
p
load-pack
-
shallow' into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Ha
m
an
o
Merge branch 'jm/maint-diff-wo
r
d
s
-wi
t
h
-sbe
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
ni
o
C Hamano
Merge branch 'kk/ma
i
nt-prefix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hamano
Merge b
r
anch
'mg/
d
iff-u
i
co
n
f
i
g
-doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
M
e
r
g
e
branch 'ft/gitweb-ta
r
-
with-gzip-n
'
into
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
M
e
rge branch 'ss/doc-svn
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Me
r
ge b
r
anch 'jn
/
format-patch-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Me
r
ge
branc
h
'jc
/
m
a
int-pathspe
c
-stdin-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branc
h
'j
k
/che
r
ry-pick-
r
o
ot-
w
ith-resolve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C Hamano
M
e
r
ge branch 'rg/
c
opy-
g
ecos-username' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch
'fc/complet
i
o
n
-zsh' into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/git-connection-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C Haman
o
M
e
rge branch 'j
s
/maint-send
-
p
ack-stat
e
less-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e
b
ranch 'svn-fe-m
a
int' of git://rep
o
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Hama
n
o
userfo
r
m
a
t_find_requirement
s
(): find requirement for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai Ngo
c
Duy
init
/
cl
o
ne: r
e
move
short
o
p
tio
n
-
L
and document
-
-
s
epa
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Hamano
handle_options(): do not miscount ho
w
man
y
arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
c
o
nfig:
a
l
w
a
ys parse GIT_CONFIG_
P
ARAMETERS
d
uri
n
g git_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
gi
t
_confi
g
: d
o
n't peek at glob
a
l config_param
e
ters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config: make environment parsing
r
outines stat
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim
M
e
yering
do not re
a
d b
e
yond end of malloc'd buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
git-svn: F
i
x git svn lo
g
--sho
w
-commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonatha
n
Nieder
provide a copy of
t
he
L
GPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff K
i
ng
t
e
s
t
core
.
g
i
tpro
x
y configur
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
R
a
fael
Giesch
k
e
copy_ge
c
os:
f
i
x not adding nlen to len
w
hen pr
o
cessing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Thomas
R
as
t
add -
i
: ignore te
r
minal
escape sequences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C Hamano
Merge branch 'j
s
/main
t
-1
.
6
.
6-send-pack-stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C Hamano
Update draft
r
eleas
e
notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
r
g
e branch 'jn/
m
aint-format-patch-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Haman
o
M
erge branch
'
ss/che
r
ry-pi
c
k-x-doc' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
r
a
nch 'vr/me
r
g
e-
b
a
se-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge br
a
nch 'sr/maint-fast-impor
t
-tighten-op
t
ion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Hamano
Merge branch 'jc/t1506-shel
l
-p
a
ram-e
x
pansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e b
r
an
c
h 'j
c
/
fix-add-
u
-
un
m
erged'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
jn/gitweb-dependenc
y
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C
Hama
n
o
Merge branch 'j
c
/maint-branch-mergeoptions'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
m
ano
M
e
r
ge
branch 'jc/maint
-
add-p-ov
e
rlappin
g
-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim
Meyeri
n
g
Docum
e
ntatio
n
/git-fsck
.
txt: fix
t
ypo: unread
a
ble -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
s
end-pack
:
avoid de
a
dlock on git://
push with f
a
iled
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next