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
string-list: Add API to remove an item from an unsorted list
2011-08-14
Johan
n
es S
i
xt
st
r
i
n
g-
l
ist:
A
dd API to remove an item from
an
unso
r
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
m
erge
-
recursiv
e
: Split was_tracked()
o
ut of would_lose_un
t
ra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-
r
ecursive: Sa
v
e D/F conflict
f
ilena
m
e
s in
s
tead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
mer
g
e-recur
s
i
ve: Fix code
c
hecking for
D/F co
n
flict
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
m
e
rge-recur
s
ive:
F
ix sortin
g
order and dir
e
ctory 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
El
i
jah Newren
merge-recurs
i
v
e: Fix recursive case with D/F conf
l
ic
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recur
s
ive: Av
o
id work
i
ng di
r
ectory
c
h
a
nges d
u
ring
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
j
ah N
e
wren
me
r
g
e
-recursive: Re
m
ember to fr
e
e gen
e
rated unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
merge-recu
r
sive
:
Consolidate
d
ifferent update_stages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h
N
ewren
me
r
ge-recursive: Mark some diff_filespec
s
truct
a
rguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recursi
v
e: Correct
a
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
mer
g
e-r
e
curs
i
ve: Mak
e
BUG message more
legible
by ad
d
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6022: Ad
d
testcase for merging a
r
e
n
amed f
i
le with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6022
:
New tests checking for
u
nnecessa
r
y updates of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t60
2
2: Remove unnec
e
ssary
untra
c
ked fil
e
s
to make test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t603
6
:
criss-c
r
oss + re
n
ame/
r
en
a
me(1
t
o2)/
a
dd-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t60
3
6:
c
riss-cross w/ ren
a
me/rename(1to2)/modify+rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6036: tests f
o
r criss-cro
s
s me
r
ges wit
h
vari
o
us dire
c
tor
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036: criss-cross
with weird
c
o
n
tent can fool gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
New
r
en
t6036: Add
dif
f
e
rently resolved modify/de
l
et
e
conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042: Add failing testcases fo
r
re
n
ame/renam
e
/ad
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newr
e
n
t6042:
Ensure rename/rename conflicts leave in
d
e
x
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
w
ren
t6042: Add test
s
for
content
i
s
s
u
es
with modify/
r
e
n
ame
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah N
e
wren
t6042:
A
dd a tes
t
case where undetec
t
ed ren
a
me causes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ij
a
h Newren
t
6042:
A
dd
a pa
i
r of case
s
where undetec
t
ed renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newren
t6042: Add failing testcase f
o
r rena
m
e/modify/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6042: Add a testcase where
g
it
d
eletes an untracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim M
e
ye
r
ing
f
etch: do
not l
e
ak a re
f
spec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C
Ham
a
no
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 bran
c
h 'jk/m
a
int-config-a
l
ias-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
b
ranch 'jc/fmt-req-fix' into mai
n
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Merge branch 'jk/maint-docs'
i
nto main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Haman
o
Merge branch 'jn/doc-remo
t
e
-
he
l
pers'
i
nto maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'kk/mai
n
t-p
r
efi
x
-in-c
o
nfig
-
m
ak'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyeri
n
g
diffc
o
re-rename
.
c: avoid set-but-not-used
w
arning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Hamano
Star
t
1
.
7
.
5
.
4
draft release note
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
ano
Me
r
ge bra
n
c
h 'tr/
a
dd-i-no-es
c
ape'
i
n
t
o main
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
mano
Merge branch
'vh
/
config-interacti
v
e-s
i
n
g
lekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branc
h
'ml/test-readme' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Me
r
g
e
branch
'
a
b/i18n-fixup
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merg
e
branch
'
j
c
/r
e
n
a
me-degrade-cc-to-c'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Ha
m
ano
Merge branch '
r
r/doc-c
o
nte
n
t-typ
e
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nieder
Documenta
t
i
o
n: do not misinter
p
ret refsp
e
cs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
J
un
i
o
C Hamano
Merge branch 'j
m
/main
t
-mi
s
c-f
i
x
' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
e
r
g
e br
a
nch 'bc/mai
n
t
-sub
m
odule-
f
ix-parked' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch
'
bc/maint-
a
pi-do
c
-parked'
into main
t
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Ham
a
no
Merge branch
'
j
n/run-command-error-failu
r
e' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-27
Junio
C Hamano
c
o
nfi
g
.
m
ak
.
in
:
allow
"configure -
-
sysconf
d
ir=/e
l
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
ocs
:
fix some a
n
tique example output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
K
ing
d
o
c
s
: m
a
ke
s
ure li
t
eral "->" isn't converted to
a
rrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: update
st
a
tus --por
c
elain f
o
rma
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: min
o
r
g
rammar fixes to git-s
t
atus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
r
an
d
on Casey
g
i
t
-submodul
e
.
sh: sepa
r
ate parens by a spa
c
e to a
v
oid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
randon Casey
Document
a
tion/t
e
chnical
/
api-di
f
f
.
t
x
t: correct nam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
King
re
a
d
_gitfile_gently: use ssize_
t
to h
o
ld
read result
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim
M
ey
e
ring
remov
e
tests of always-false cond
i
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
im
Meyering
r
e
rere
.
c: diagno
s
e
a
c
o
r
r
upt MERGE_R
R
when hitti
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Mer
g
e branch 'm
a
int-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Ham
a
n
o
Merge branch 'jk/gi
t
-connec
t
i
o
n-d
e
adlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge
branch 'js/maint-send-
p
ack
-
stateless-rpc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Haman
o
Merge branc
h
'jk/mai
n
t-uploa
d
-pack-shall
o
w' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge bran
c
h 'jm/main
t
-diff-words-w
i
th-sbe
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Ham
a
no
Merge branch 'kk/maint-prefix-in-
c
o
n
fig-mak' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merge branch 'mg/diff-uiconfig
-
doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C Hama
n
o
Merge branch 'f
t
/gitweb-tar-w
i
th-gzip-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch 'ss/do
c
-
s
vn' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Me
r
g
e
bran
c
h 'jn/format-p
a
tch-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C Hama
n
o
Merge branch '
j
c/maint-
p
athspec-stdin-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Ham
a
no
Merg
e
b
r
anch 'jk/
c
her
r
y
-pic
k
-
r
o
ot-with-resolve' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'rg/c
o
py-
g
ecos-username' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Me
r
g
e branch 'fc/co
m
pletion-zsh' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C
Hamano
Merge branch 'jk/git-c
o
nnect
i
o
n
-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge branch
'j
s
/maint-send-pack-
s
tat
e
les
s
-rpc-d
e
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio
C
Ha
m
a
n
o
M
erge bra
n
ch 'svn-fe-maint' o
f
git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio
C Hamano
userformat_
f
i
nd_
r
equirements(): find r
e
quir
e
m
e
n
t
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai
N
goc
Duy
init/clone: remove
s
hort
optio
n
-L and document --separat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jun
i
o C H
a
m
a
no
h
a
ndle_options(): d
o
not miscount how
m
any 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 K
i
ng
co
n
fig: alwa
y
s parse GIT_CONF
I
G_PARAMETERS dur
i
ng git_
c
onfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_config: don'
t
peek at gl
o
bal con
f
ig_
p
arameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
King
config: make environment parsi
n
g routines static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim Me
y
e
r
ing
do not read beyond end
of malloc'd
b
uffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gru
b
er
git-svn: F
i
x git
svn
l
o
g
--show
-
comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C H
a
mano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Ni
e
der
provide a
copy of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff Kin
g
t
est c
o
re
.
g
i
tproxy configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafael
Gieschke
copy_gec
o
s
:
fix not ad
d
ing nlen to l
e
n when processing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Thomas R
a
st
a
dd -i: ignore terminal escape seque
n
ces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C
Ha
m
ano
Mer
g
e
b
r
a
nch 'js/maint-1
.
6
.
6-sen
d
-p
a
ck-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update
dra
f
t
r
e
lease notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
M
erge branch
'
jn/maint-format-patch-
d
o
c' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
M
erge bra
n
ch 'ss/cherr
y
-pic
k
-
x
-
d
oc' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'vr/merge-base-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch '
s
r/
m
aint-fast-import
-
tighten-option
-
pars
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C
Hamano
M
er
g
e branch 'jc/t15
0
6-sh
e
ll-param
-
expansio
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
M
erge br
a
nc
h
'jc/fix-a
d
d-u-unmerged
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merg
e
b
r
an
c
h 'jn/gitweb-depe
n
denc
y
' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merge branc
h
'
jc/maint-branch-
m
ergeo
p
t
ions' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
mano
Merge br
a
n
c
h 'jc/m
a
int-a
d
d-p-over
l
apping-hunks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Mey
e
ring
D
ocum
e
ntat
i
on/
g
it
-
fsck
.
txt:
fi
x
ty
p
o: un
r
e
a
dab
l
e
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next