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
J
ohann
e
s
S
i
xt
s
t
ring-list: Add API to rem
o
ve an item from an
u
nsorted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
me
r
ge-recur
s
ive: Split was_tracked() out of would_lose_untra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
m
erge-recursive: Save
D
/F conflict filenames instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Fix code check
i
ng for D
/
F con
f
licts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newren
mer
g
e
-recur
s
i
v
e
:
Fix sorting order and dire
c
tory
ch
a
nge
.
.
.
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 recursive ca
s
e wi
t
h D/F conflic
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Ne
w
r
en
me
r
ge-re
c
urs
i
v
e
: Avoid working directory
chan
g
es du
r
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge
-
r
ecursive: Reme
m
ber to free ge
n
e
rat
e
d unique
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
merge-recursive: Consolidate di
f
f
ere
n
t update_sta
g
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
merge-recu
r
sive: Mark some diff
_
f
ilespec
s
t
r
uct argu
m
en
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
merge-rec
u
r
s
ive: Correct a comm
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
me
r
ge-recursive: Make
B
UG message m
o
r
e
leg
i
ble by
a
dding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
Newr
e
n
t6022:
Add testcase for merging
a
renamed file w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah New
r
en
t6022: New
t
ests checking for unnec
e
ssary updat
e
s of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
N
ewr
e
n
t
6
022
:
Rem
o
v
e un
n
e
c
essary
u
nt
r
acked f
i
les
to make test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ewren
t6036: criss-c
r
oss +
rename/renam
e
(1t
o
2)/add-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
t6036: criss-cross
w/ rename/rename(1to2)/modify+ren
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Ne
w
ren
t
6036: t
e
sts for
criss-cr
o
ss merges with
v
ariou
s
d
i
rectory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t6036:
c
r
i
ss-cross wit
h
weird
c
o
n
tent can fool g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah N
e
wren
t
6
03
6
: A
d
d d
i
ffe
r
ent
l
y r
e
solved modify/delete
c
o
n
f
l
ict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
ewre
n
t6042: Ad
d
f
ail
i
n
g testcase
s
f
o
r
r
enam
e
/rename/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Ensure
r
en
a
me/rename conflicts leave index and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ijah Newre
n
t6
0
4
2
:
A
dd t
e
s
ts for content i
s
sues with modify/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
N
e
w
ren
t
6042: Add a testcase where unde
t
ected r
e
n
ame causes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6042: Ad
d
a pair of case
s
where und
e
tected renam
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042: Add
f
a
i
li
n
g
t
est
c
ase for rename/
m
odify/
a
dd-so
u
rce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t60
4
2: Ad
d
a tes
t
case
w
here git deletes an untr
a
cke
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
J
im Mey
e
ring
fetc
h
: do not leak
a refspec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
G
it 1
.
7
.
5
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
amano
Me
r
ge
b
ranch
'
jk/m
a
int-con
f
ig-al
i
as-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
Hama
n
o
M
e
r
ge bra
n
c
h
'jc/fmt-r
e
q-fix
'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
H
amano
Merge
b
ran
c
h
'
jk/m
a
int-docs' into maint
commit
|
commitdiff
|
tree
2011-06-01
Ju
n
i
o
C Hamano
M
e
rge branch 'jn/doc-remote-
h
elpers' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
u
nio C Hamano
Merge b
r
anch
'
kk/maint-
p
r
efix-in
-
conf
i
g-mak' into maint
commit
|
commitdiff
|
tree
2011-06-01
Jim Me
y
eri
n
g
d
iffco
r
e-renam
e
.
c:
avo
i
d set-but-not-used 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
J
unio C Ha
m
ano
Merge
b
ranch '
t
r/add-i-no-escape' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Merge branch
'vh/c
o
nfi
g
-
inter
a
ctive-sin
g
lekey-
d
oc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Ha
m
ano
Merge
b
ranch
'
m
l
/tes
t
-readme' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Ha
m
ano
Merge
b
ranch 'ab/
i
18
n
-fixup'
into main
t
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
M
erg
e
b
ranch 'jc/rename-degrade-cc-t
o
-c' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
i
o
C
Ham
a
n
o
Merge bra
n
ch 'rr/doc-c
o
ntent-type' into
maint
commit
|
commitdiff
|
tree
2011-05-30
Jonath
a
n Niede
r
D
o
c
umen
t
ation: d
o
not misi
n
terpr
e
t refsp
e
cs as
b
old
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Hamano
Merge branch 'jm/
m
ain
t
-misc-fix
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'bc/ma
i
n
t
-submodule-f
i
x-parked'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge b
r
anch
'
bc/m
a
int-ap
i
-d
o
c-par
k
ed' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge bran
c
h 'jn/
r
un-com
m
a
n
d-e
r
ror-failure' into maint
commit
|
commitdiff
|
tree
2011-05-27
Ju
n
io
C Hamano
config
.
mak
.
i
n: allow "configur
e
--sysconfdir=
/
else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
d
ocs: fix some ant
i
que exampl
e
o
ut
p
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f King
docs: make 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: update sta
t
us
-
-porcelain format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs
:
minor
g
r
a
mmar fi
x
e
s
to git-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
randon Casey
git-submodule
.
sh: separate 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
Brandon Casey
Docume
n
t
a
tion/technical/api-
d
iff
.
txt: c
o
rrect name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
r
e
ad
_
g
i
t
f
ile_
g
ently
:
use
ssize_t to hol
d
re
a
d res
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim
M
eyerin
g
remove
t
ests
of
always-false cond
i
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
rere
r
e
.
c: diagnose
a co
r
rupt
MERGE_R
R
when hitti
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio 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
rge branch
'm
a
i
n
t
-
1
.
7
.
4' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge b
r
a
nch
'
j
k/gi
t
-connection-deadlock-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Mer
g
e branch 'j
s
/maint-send-pack-statele
s
s-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C
Hamano
Me
r
ge branc
h
'jk
/
ma
i
nt-upload
-
pack-sha
l
low' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
n
o
M
erge branch
'jm/main
t
-dif
f
-words-with-sbe' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hama
n
o
Merge branch
'
kk/maint-prefix-in-config-ma
k
' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
Hamano
Merge bran
c
h
'
mg/diff-uiconfig-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ham
a
no
Merge
branch 'ft/gitweb-tar-with-gzip-n' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch
'ss/do
c
-
s
vn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge bran
c
h
'jn/forma
t
-
patch-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C
H
a
ma
n
o
M
erge branch 'j
c
/m
a
int-p
a
thspec-stdin-
a
nd-cmdline
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge br
a
nch '
j
k/ch
e
r
r
y-pick
-
root-with-resolve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch 'rg/copy-geco
s
-usern
a
m
e' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
Hamano
Mer
g
e bran
c
h 'fc/
c
omplet
i
on-zsh' into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
bra
n
ch
'jk/git-connection-deadlock-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge branch
'js/
m
aint-send
-
pa
c
k-stat
e
le
s
s-rpc-
d
eadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
man
o
Mer
g
e br
a
nch 's
v
n-f
e
-
maint' of g
i
t:/
/
rep
o
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Hamano
userformat_f
i
nd_require
m
ents(): find requi
r
ement
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai Ngo
c
Duy
i
n
it/c
l
o
n
e:
r
em
o
ve sh
o
r
t
opt
i
on -L and d
o
cument -
-
sepa
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio
C
H
amano
h
an
d
le_options():
do not miscou
n
t ho
w
many argume
n
t
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 K
i
ng
config: a
l
wa
y
s parse GIT_CONFIG_
P
ARAMETERS du
r
ing git_confi
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff K
i
ng
git
_
config: don't peek at global config_para
m
eter
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config:
make environment p
a
rsing routines
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim Me
y
erin
g
do not
read bey
o
n
d end of malloc'd buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael
J
Gr
u
ber
git-svn: Fix
g
it svn log --show-comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
amano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jo
n
athan Nieder
p
rov
i
de a c
o
py o
f
the LGPLv
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff
K
ing
test
c
ore
.
gitpr
o
x
y
con
f
iguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
R
a
f
a
el Gieschke
c
o
py_gecos: fix not a
d
d
i
ng
n
l
e
n to l
e
n w
h
en pro
c
essing
"&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Thomas
R
ast
add -i:
ign
o
re terminal 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/maint-1
.
6
.
6-sen
d
-pack-statele
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
am
a
no
Upda
t
e dr
a
ft re
l
ease notes t
o
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
am
a
no
Merge branch 'jn/ma
i
nt-format-p
a
tch-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge b
r
anch '
s
s/cherry-pick-x-
d
oc' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge bra
n
c
h 'vr/merge-base-doc
'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branch 'sr/maint-fast-import-t
i
ghten-option-
p
a
rsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ranch 'jc/t1506-
s
he
l
l-param-expan
s
io
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge branch 'jc
/
fix-add-
u
-unmerg
e
d' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C Hamano
Merge branch '
j
n/gitweb-de
p
endency' into
main
t
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hama
n
o
M
e
rge
branc
h
'jc/main
t
-
b
ranch-mergeop
t
i
ons' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Mer
g
e branch 'jc/maint-add-
p
-
overl
a
ppi
n
g-hunks'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim
M
eyering
Documen
t
ation/git-f
s
ck
.
txt:
f
i
x
ty
p
o
:
unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next