repo.or.cz
/
git
/
dscho.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
Elijah Newren
merge-recurs
i
ve
:
Split was_tracked(
)
out of wo
u
ld_
l
ose_untra
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
mer
g
e-re
c
ursive: Save D/F c
o
n
f
lict filenames ins
t
ead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge
-
rec
u
rsive:
F
ix code
checking for
D/F
c
onflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newre
n
merge
-
recur
s
i
ve: F
i
x s
o
rting
o
rder and directory 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
merge-recursive: Fix recu
r
sive case with D/F con
f
lict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewr
e
n
me
r
ge-recursive
:
Avoid w
o
rking direct
o
ry
c
han
g
es
du
r
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-
r
ecurs
i
ve: Reme
m
ber to free g
e
nera
t
ed un
i
que
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
mer
g
e-recursi
v
e
: Consolidate
d
ifferent u
p
date_stages
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
u
r
sive: Mark some diff_filespec struct argument
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-re
c
ursive: Correct
a
com
m
en
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
e
rge-recu
r
sive
:
M
a
ke BUG
m
essa
g
e more legible
by add
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
ren
t6022: Add
t
estcase
for
mer
g
ing a renamed file
with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t60
2
2: New tests checkin
g
for un
n
ecessar
y
upda
t
es of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t60
2
2: Remov
e
u
n
necessary untrac
k
e
d
files to make
test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newr
e
n
t6036: criss-
c
ro
s
s
+
rename/
r
ename(
1
to2)/add-sour
c
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t603
6
:
criss-cros
s
w/ ren
a
me/rename
(
1to2)/
m
odify+ren
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t603
6
: tes
t
s f
o
r criss-cross m
e
rges with various d
i
rectory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss
-
cross with weird
c
onten
t
can f
o
o
l
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: Add differently r
e
solved modify/delete co
n
f
li
c
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
t
6
042: Add failing te
s
tc
a
ses for rename/rename/add
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6042: Ensur
e
rename/rena
m
e conflicts lea
v
e index and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add tests for content is
s
ues with modify/rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6042
:
A
d
d a testcase
w
here undet
e
cted
r
ename causes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah N
e
wren
t6
0
42: Add
a
pair of cases where undet
e
cted renames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6042: Add fai
l
ing testcase for rename/mo
d
i
f
y/add-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
en
t6
0
42:
Add a testcase wh
e
r
e git
d
e
lete
s
an untracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyering
fetch
:
do no
t
leak a re
f
s
pe
c
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
Jun
i
o C
H
ama
n
o
Merge br
a
nch
'
j
k
/
m
aint-config-alia
s
-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Hamano
M
e
rge
b
ranch 'jc/f
m
t-req
-
f
i
x' into m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C Ha
m
ano
Me
r
ge
branc
h
'j
k
/maint-docs
'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'jn/doc-remote-hel
p
e
rs
'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C H
a
mano
Merge
b
ranch '
k
k/maint-pre
f
ix-in-config-ma
k
'
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2011-06-01
J
im Mey
e
ring
diffco
r
e-
r
ename
.
c
:
a
v
o
id
set-
b
ut
-
not-u
s
e
d
w
ar
n
i
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Haman
o
Start 1
.
7
.
5
.
4 draft rele
a
se notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
am
a
no
Me
r
ge branch 'tr/add-i-no-escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
a
m
a
n
o
M
er
g
e
b
ranch 'vh/
c
onfig-i
n
terac
t
iv
e
-
s
i
nglekey-do
c
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Hamano
Mer
g
e br
a
nch 'ml/te
s
t-rea
d
me' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Hamano
Merge b
r
a
n
c
h
'ab/i
1
8n-
f
ixup' int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-31
Junio
C H
a
mano
M
erge
b
ranc
h
'jc/ren
a
me-degr
a
de-cc-to-c' int
o
maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Hamano
Merge
b
ranch
'
r
r/doc-co
n
t
e
n
t-type' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Ni
e
der
D
o
cumen
t
ation
:
do
n
ot
misinte
r
pret refspecs a
s
bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C
H
amano
Merge b
r
a
nch 'jm/
m
aint-misc-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C Hamano
Merge
b
ranch 'bc/maint-submodule-f
i
x-parked' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
J
unio C Hamano
Merg
e
bra
n
ch 'bc/maint
-
a
pi-do
c
-park
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
u
n
io C Hamano
Merge branch '
j
n
/run-co
m
mand
-
error-failure' into maint
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
config
.
mak
.
i
n
:
allow "config
u
re --sysconfd
i
r
=
/else
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff King
docs: fix som
e
a
n
tique example outp
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
o
cs: make sure literal "->" isn't converted to arrow
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
King
docs: upd
a
te status --porcela
i
n form
a
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
i
ng
docs:
m
inor
g
ramma
r
fix
e
s to git-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brand
o
n Cas
e
y
git-su
b
m
odule
.
sh: separate
parens by
a
space to a
v
oid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon
Casey
Docume
n
tat
i
on/techni
c
a
l/api-diff
.
txt: correct nam
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f K
i
ng
read_gitfile_gent
l
y
:
u
se ssi
z
e
_
t to h
o
ld read res
u
lt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
re
m
ove test
s
of always-f
a
lse c
o
n
d
i
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Ji
m
Meyering
rer
e
re
.
c
:
diagnos
e
a
corrupt M
E
RGE_RR w
h
en hitting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
G
i
t 1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
M
e
rg
e
branch 'maint-
1
.
7
.
4' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
aman
o
Merge branch 'j
k
/gi
t
-connectio
n
-dead
l
ock-fix' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
M
erge
bran
c
h 'js/
m
aint-send-pack
-
stateless-rp
c
-deadl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge
b
ranch
'
jk/maint-upload-p
a
c
k
-shallow' i
n
to
m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Haman
o
Me
r
g
e
branch
'
jm/
m
aint-diff-words-with-sbe'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
H
amano
Me
r
ge branch
'
mg/diff
-
uiconfig-doc' into
maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C H
a
ma
n
o
Merge
b
ranch 'ft
/
gitweb-tar-with-
g
zip-n'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge b
r
anch 'ss/doc-svn' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o
C
Hamano
Merge
b
ra
n
ch 'jn/for
m
at-pat
c
h
-
d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
M
e
r
ge
branch 'jc
/
maint-
p
athspec
-
st
d
i
n-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Merg
e
b
r
anch 'jk/che
r
ry-pick-ro
o
t-with-res
o
lve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Mer
g
e branc
h
'
rg/copy
-
ge
c
o
s-u
s
e
rname' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Me
r
ge
b
ranch
'fc/completion-z
s
h' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge bra
n
c
h 'jk/git-connection-deadloc
k
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge
b
ranch 'js/maint-send-
p
ack-statel
e
ss-rpc-d
e
adlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
Ha
m
a
no
M
erge b
r
anch 'svn
-
f
e-mai
n
t' of git://repo
.
or
.
cz/
g
it
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C
H
amano
userformat_find_r
e
quirements(): find requirement
f
or
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai N
g
oc D
u
y
init/cl
o
ne
:
r
e
move shor
t
option -L and do
c
u
m
ent --separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
J
u
nio C
H
amano
h
an
d
le_options():
d
o not misc
o
unt how many
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
J
e
ff King
config: always pa
r
se GIT_CONFIG_PARAMETERS during g
i
t_
c
o
nfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
King
g
i
t_config: don'
t
peek at glo
b
a
l
config_p
a
rameters
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config
:
make env
i
ron
m
e
nt
parsing ro
u
tines static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
i
m Meyering
do n
o
t read be
y
ond en
d
of malloc'd buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
g
it
-
svn:
Fix git svn log --show
-
commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
ano
G
it
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
o
na
t
han Nie
d
er
provide a copy of the LGPLv2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Je
f
f K
i
n
g
test core
.
gi
t
proxy con
f
igurat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Rafael
G
ies
c
h
k
e
c
opy_g
e
cos:
fix not a
d
ding nlen
t
o
l
en when processing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
T
ho
m
as Rast
add -i: ignore termin
a
l
e
scape sequ
e
nces
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio
C
Hamano
Merge br
a
nch 'js/
m
ain
t
-1
.
6
.
6-send-
p
ac
k
-
s
t
a
tele
s
s-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draft release
notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C
Hamano
M
e
rg
e
branch 'jn/maint-format-patch-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branch '
s
s/cherry-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Ham
a
no
Merge
br
a
nch
'v
r
/mer
g
e-base-doc'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o
C
Haman
o
M
erge branch 'sr/m
a
int-fast-im
p
ort-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
er
g
e branch
'j
c
/t1506-she
l
l-param-exp
a
n
sion-g
o
t
c
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
M
e
rge bra
n
ch 'jc/fix-add-
u
-
unmerged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge
b
r
a
n
ch
'
jn/gitweb-depen
d
ency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge branch 'jc/ma
i
nt-branch
-
mergeoption
s
' into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
Hamano
Me
r
g
e br
a
nch 'jc/maint-add-p-ov
e
rl
a
pping-h
u
n
ks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ji
m
M
e
yerin
g
Documentation/g
i
t-fsck
.
txt: fix t
y
po:
u
nrea
d
able -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
send-
p
a
ck: avoid deadlock on g
i
t
:
// push wi
t
h fai
l
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next