repo.or.cz
/
git
/
mjg.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
Jo
h
annes
S
ixt
s
t
ring-l
i
st: Add API to
r
emov
e
an i
t
e
m
f
r
om an unsorted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Split was_tracked() out o
f
would_lose_untra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
merge-recursive: Save D/F conflict filenames in
s
tead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
merge-
r
ec
u
rsive: Fix code
checking for D/F conf
l
icts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h Newren
merge-recur
s
ive: Fix s
o
rting o
r
d
e
r a
n
d directory
c
h
a
ng
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
Elijah N
e
w
ren
merge-r
e
cursiv
e
: Fix recursi
v
e c
a
se
with D/F c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge
-
recu
r
si
v
e
:
A
void working directory
c
h
anges during
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah
Newr
e
n
merge-recursive: Re
m
e
m
b
e
r
to free generat
e
d unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recursive: Consolid
a
te diffe
r
ent update_stages
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
N
e
w
ren
merge-recursive: Mar
k
s
o
me dif
f
_filesp
e
c
s
truct arguments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
merge-
r
ecursive: Corre
c
t a
comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
m
e
rge-recursive: Mak
e
BUG message more legible by adding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
t6022:
A
dd test
c
ase for m
e
rging a renamed fi
l
e
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: New tests c
h
ecking fo
r
unnecessar
y
updates
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6022: Remove
unn
e
c
e
ssa
r
y unt
r
acked fil
e
s to
m
ake test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6036: criss-cross
+ re
n
ame/rename(1to2)/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lij
a
h New
r
en
t60
3
6: cri
s
s-cross w
/
rename
/
rename(1to2)/m
o
dify+r
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
t6036: tests for cris
s
-cross merges wit
h
various directo
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t
6
036: c
r
iss-cro
s
s with wei
r
d con
t
ent can fool gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
New
r
en
t6
0
36:
Add differentl
y
resolved modify/d
e
lete
c
onflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t6042: Add failing te
s
t
c
ases for rename
/
renam
e
/ad
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
a
h
N
e
wren
t6042: Ensu
r
e
rename/re
n
ame confli
c
ts leave in
d
ex and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah
N
ewr
e
n
t60
4
2: Add tests for
c
ontent
i
ssu
e
s with modify
/
ren
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t604
2
:
A
dd a tes
t
c
ase where
und
e
tected rena
m
e
c
a
us
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newr
e
n
t
6
042
:
Add a
pair of case
s
where undetected renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
42: Add failing testc
a
se for ren
a
m
e
/
mo
d
ify/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
t6042: Add a
tes
t
case
whe
r
e git delete
s
an untr
a
c
k
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyering
fetch:
d
o
not
l
eak a refspe
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
J
u
ni
o
C Hamano
G
i
t 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
amano
M
e
rge br
a
nc
h
'jk/
m
aint-c
o
nfig-alias-fix' i
n
to maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
Haman
o
Merg
e
branch 'jc/fmt-re
q
-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Junio C
Ha
m
a
no
Merge branch 'jk/m
a
i
n
t-docs' into
m
aint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'jn/doc-re
m
ote-hel
p
e
r
s' into maint
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C
Hamano
Merge
b
ranch
'
kk/
m
a
int-
p
refix-in-co
n
fig-mak' into maint
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyering
dif
f
c
ore-rename
.
c
:
avoid se
t
-bu
t
-no
t
-us
e
d w
a
r
n
ing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Start 1
.
7
.
5
.
4 draft rele
a
s
e
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Mer
g
e
bra
n
c
h
'tr/add-i-no-escape' int
o
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge br
a
nc
h
'
v
h/config
-
in
t
er
a
ct
i
v
e
-singlekey
-
doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o
C Hamano
Merge
b
ra
n
c
h 'ml/test
-
readme' into maint
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C
H
ama
n
o
Mer
g
e branch
'
a
b
/
i
18n-fixup' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
ni
o
C Hamano
Merge
b
r
anch 'jc/rena
m
e-degrade-cc-to-c' int
o
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
ano
Merge b
r
anch
'rr/d
o
c
-
conten
t
-typ
e
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Jona
t
h
a
n
Nieder
Documentation:
do not mi
s
interpret r
e
f
specs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'jm/
m
aint-misc-fix' i
n
to
mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
e
r
ge
b
ranch 'bc
/
maint-submodule-fix-par
k
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C Hamano
Merg
e
branch 'bc/maint-api-d
o
c-parked
'
int
o
main
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ham
a
no
Mer
g
e
b
ranch 'jn/ru
n
-command-err
o
r-failure' i
n
to m
a
in
t
commit
|
commitdiff
|
tree
2011-05-27
Junio
C
H
amano
con
f
ig
.
ma
k
.
in:
a
llow "
c
onfigure -
-
sysconf
d
ir=/
e
lse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: fix
s
o
m
e ant
i
que example outp
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
docs: m
a
ke sure literal "->" isn't conver
t
ed to arrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs
:
upd
a
t
e s
t
atus --porcel
a
in fo
r
mat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f King
docs: minor
g
r
amm
a
r fixes
t
o git-s
t
atus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brand
o
n Casey
git-subm
o
d
u
le
.
s
h
: sepa
r
ate pare
n
s by a space to av
o
id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brand
o
n
C
a
sey
Do
c
umentation/
t
echnical/a
p
i-diff
.
txt: corr
e
ct
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
r
ead_gitfile_
g
ently: use ssi
z
e_
t
to hol
d
read result
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m Meyer
i
ng
remove tests of a
l
ways-f
a
l
se c
o
ndition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim
M
e
y
e
r
ing
r
ere
r
e
.
c:
d
iagnose a corrupt M
E
RGE_RR
when hi
t
t
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
an
o
Merg
e
b
r
anch 'maint
-
1
.
7
.
4' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C Hamano
Merge branch 'jk/git-con
n
ect
i
on-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge b
r
a
nch '
j
s/maint-send-pack-statele
s
s-rpc
-
deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
M
erge
branch
'jk/mai
n
t-upload-pack-shallow' into main
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e b
r
a
nch '
j
m/maint-diff-word
s
-with-sbe' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
H
a
m
ano
Merge bran
c
h '
k
k
/
maint-
p
refix-in-
c
onfig-mak'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge br
a
nch
'
mg/diff
-
uiconfi
g
-doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch
'
ft/
g
itweb-ta
r
-with-gzip-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
an
o
Merge br
a
nch 's
s
/doc-svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hama
n
o
Merge branch 'j
n
/format-patch-doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C H
a
mano
Merge bran
c
h '
j
c
/
maint-
p
a
thspec-stdin
-
and-cmdlin
e
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Ham
a
no
Merge branch
'jk/che
r
ry-pi
c
k
-
root-with-resolve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branc
h
'rg/copy-gecos-us
e
rname' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C
Hamano
M
e
rge branch
'fc/
c
omplet
i
on-zsh' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge bra
n
ch 'jk/git-connec
t
i
on-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio
C
Hama
n
o
Merge branch 'j
s
/maint-se
n
d-p
a
ck-stateles
s
-r
p
c-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Ha
m
ano
Merge branch
'svn-fe-maint' of git://
r
epo
.
o
r
.
c
z/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Jun
i
o C Hamano
userformat_find_re
q
uirements(): fi
n
d requ
i
rem
e
n
t
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai Ngoc Duy
i
nit/clone: rem
o
v
e
short opti
o
n -L and docu
m
ent
-
-sep
a
rate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Hamano
h
a
ndle_options()
:
do not miscount
h
ow many arg
u
ment
s
.
.
.
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
config: always parse GIT_CONF
I
G_PARA
M
ETERS during
g
it_c
o
nf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff
K
ing
git
_
conf
i
g
: don't peek at global config_parameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config
:
mak
e
environme
n
t parsing routine
s
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim Meyering
do not rea
d
beyond e
n
d of mall
o
c'd buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gr
u
ber
g
i
t
-s
v
n:
Fix
g
it svn log --show-
c
omm
i
t
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
Jonathan N
i
e
d
er
provi
d
e a copy of
t
he LG
P
Lv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
g
it
p
roxy
conf
i
gurati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafael Gieschke
copy_
g
ecos: fi
x
not a
d
ding nlen
t
o len when
proc
e
s
s
ing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
T
h
omas Rast
a
d
d
-
i: i
g
n
o
re termina
l
escape sequences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio
C
H
amano
Merge branch 'js
/
mai
n
t-1
.
6
.
6-send-p
a
ck-
s
tateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draft r
e
lease note
s
t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Me
r
ge branch '
j
n/maint
-
for
m
at-patch-doc'
i
nto
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge br
a
nch 'ss/cherry-pick-x-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ranch
'
vr/merge-b
a
s
e-do
c
' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nch '
s
r/m
a
int-
f
as
t
-import-tighten-opti
o
n
-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ham
a
n
o
Mer
g
e branch 'jc/t1506
-
shell-p
a
r
a
m
-
e
xpansio
n
-
g
otcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Me
r
ge branch 'jc/fix-add-u-unmerg
e
d' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hama
n
o
Merge branch 'jn
/
gitw
e
b
-
dependen
c
y'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ham
a
no
Merge bran
c
h 'jc/maint-branc
h
-
mergeoptio
n
s' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
r
a
nch 'jc/ma
i
nt-add-p-overlapping-hunk
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim M
e
yeri
n
g
D
ocumentatio
n
/g
i
t-fsck
.
txt: fix
typo: un
r
ead
a
ble -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next