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
t6022: Add testcase for merging a renamed file with a simple change
2011-08-14
Elijah Newre
n
t6022: A
d
d
t
estcase for merging a renam
e
d file
wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t602
2
:
N
e
w tes
t
s
chec
k
in
g
for unnec
e
ssary upd
a
tes of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
022
:
R
e
move unnecessary untrack
e
d fil
e
s
t
o make
test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6036:
c
r
iss-cross + rename/re
n
am
e
(1to2)
/
a
dd-source
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
ewren
t6036: criss-cross w/ rename/
r
ename(1to2)/modify+rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t60
3
6: tests for
c
r
iss-cross
m
erges
with various
directory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t6036: criss-cross
w
i
th weird content
can fool git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6036: Add differentl
y
resolv
e
d
modify/d
e
lete conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042:
A
dd fai
l
ing testcases f
o
r rename/rename/ad
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6042:
E
nsure
rename/rename conflicts leave inde
x
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042:
A
dd tests
for c
o
ntent issues wi
t
h modify/rena
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Eli
j
ah Newren
t6042
:
Add a testcase w
h
e
re undetec
t
e
d
rename
causes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6
0
42: Add a
p
air
o
f ca
s
es where undetected renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Ne
w
ren
t6042: A
d
d f
a
iling te
s
t
case for rename/modi
f
y
/add-sour
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t
6042: Add a testcase wh
e
re git
deletes an u
n
tracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim M
e
yering
fetch: do not leak a refspe
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
J
u
n
i
o
C
Hamano
Me
r
ge branch 'j
k
/m
a
int-co
n
f
i
g-
a
lias-fi
x
' into m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Me
r
ge b
r
a
n
ch 'jc/fmt-
r
eq-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C Hamano
Merge
branch 'jk/m
a
int-
d
o
c
s
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o C
H
ama
n
o
Merge branch '
j
n/doc-remote-help
e
rs' into
m
aint
commit
|
commitdiff
|
tree
2011-06-01
J
uni
o
C Haman
o
Merge branch 'kk/maint-prefix-in-con
f
ig-m
a
k' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-06-01
Jim Meyer
i
ng
dif
f
core-rename
.
c: a
v
oid set-but-not
-
use
d
wa
r
ning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
J
u
nio C Ham
a
no
Start 1
.
7
.
5
.
4 dr
a
ft release n
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Me
r
ge
branch 'tr/add-i-n
o
-escape' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
ano
Merge branch 'vh
/
config-interactive-sin
g
lekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
M
e
rge branch
'ml/test-rea
d
me' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
mano
M
e
rge branch 'ab/i
1
8n-fixup' int
o
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'jc/r
e
name-degrad
e
-
cc-to
-
c' i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hama
n
o
Merge
bran
c
h 'rr/d
o
c-
c
ontent-type
'
into maint
commit
|
commitdiff
|
tree
2011-05-30
Jonatha
n
Nieder
Docum
e
ntati
o
n:
d
o not misinte
r
pret
r
ef
s
pecs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Junio
C
Hama
n
o
Mer
g
e bra
n
ch '
j
m
/ma
i
nt-misc-fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C Hamano
Merge branch 'bc/ma
i
nt-submodule-fix-parked'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch 'bc
/
main
t
-ap
i
-doc-parked' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-30
J
unio C Ham
a
n
o
Mer
g
e br
a
nch 'jn/run-command-error-fai
l
u
r
e
'
i
nt
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
con
f
i
g
.
mak
.
in: allow
"con
f
igure --sysconfd
i
r=
/
else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Kin
g
doc
s
: fix s
o
me a
n
tique
exa
m
ple output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f King
doc
s
: make sure
l
i
teral "->" isn't
c
onv
e
rted to arrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff Ki
n
g
d
ocs: upda
t
e status --
p
o
r
ce
l
a
i
n
format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
n
g
docs
:
m
in
o
r g
r
ammar fi
x
es to git-st
a
t
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
B
r
a
n
d
on Casey
git-
s
ub
m
odule
.
sh: separate
p
arens
b
y a space to a
v
oid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Br
a
ndon Ca
s
ey
Document
a
ti
o
n/technical/api-diff
.
txt:
correct
n
a
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
K
ing
read_gitfile_gent
l
y:
use ssize
_
t to h
o
ld re
a
d res
u
lt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remove te
s
ts of always-false c
o
ndition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
J
i
m Meyering
r
e
rere
.
c: diagnose a corrupt MERGE_RR when
hitt
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
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
Merge branch
'
ma
i
nt-1
.
7
.
4' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
M
erge b
r
anch 'jk/
g
it-c
o
nnection-dead
l
ock-fix'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
M
e
rge bran
c
h '
j
s/maint
-
send-p
a
ck-statele
s
s-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge
b
ranch 'jk/maint-upload-pack-shallow' int
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branc
h
'
j
m
/maint
-
diff-words-with-sbe'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Me
r
ge branch
'kk/maint-prefix-in-config-mak' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge branch 'm
g
/
d
iff-uiconfig-doc' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
M
erge branch
'
ft/gi
t
web-tar-with-
g
z
i
p-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
am
a
no
M
erg
e
b
r
anch 's
s
/do
c
-
sv
n
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C
Hama
n
o
M
e
rge branch
'
jn
/
format-patch
-
doc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Me
r
ge br
a
nc
h
'jc/
m
ai
n
t-pathspec-stdin-and-
c
mdli
n
e'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge branch 'jk/cherry-pick-
r
oot-with-res
o
lve' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'rg/copy-g
e
cos-userna
m
e
'
into
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
branch
'
f
c/comp
l
etion-zs
h
'
into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge
b
ranch 'jk/git-con
n
ection-dead
l
ock-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
uni
o
C Hamano
Merge branch 'js/maint-send-pa
c
k
-stateless-rpc-deadl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e
br
a
n
c
h '
s
vn-
f
e-maint
'
of git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Hamano
userforma
t
_find_requir
e
me
n
ts():
fin
d
requiremen
t
for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen Thai Ngoc
Duy
init/c
l
one:
re
m
o
v
e sh
o
rt option -L and
d
oc
u
men
t
--separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Ju
n
io C H
a
mano
han
d
le_op
t
i
ons(): do
not misc
o
unt how many ar
g
ume
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 King
config: alw
a
ys parse GIT_CONFIG_PARAMETERS du
r
ing git_confi
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
gi
t
_c
o
nfig:
d
o
n'
t
p
e
ek at gl
o
b
a
l
c
onf
i
g_parame
t
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
config: make
environment parsing routines static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim Meyering
d
o
not read beyond e
n
d
of malloc'd buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gr
u
b
e
r
git-svn: Fi
x
git
s
v
n log --show-
c
ommit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
ano
Gi
t
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
on
a
than
N
ieder
provide a copy of
t
h
e
LGP
L
v
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitproxy c
o
nfigu
r
ati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Ra
f
ae
l
Gieschke
copy_gecos:
fix not adding nlen to len when pro
c
e
ssin
g
"&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
T
h
o
mas
R
ast
add -
i
: i
g
nore termina
l
escape sequen
c
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Juni
o
C Hamano
Merge br
a
nch 'js/maint-1
.
6
.
6
-
send
-
pack-stateles
s
-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
m
a
no
Update
d
raft relea
s
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
Mer
g
e b
r
a
n
ch 'jn/maint-format-patch-doc' into
maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merg
e
branch 'ss/cherry-pic
k
-x-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge
b
ranch '
v
r/merge-base-do
c
' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
a
man
o
Merg
e
branch
'sr/maint-fast
-
import-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o
C H
a
man
o
M
erge branch 'jc/t15
0
6-shell-param-expansio
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/fix-add-u-unmerge
d
'
into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch 'j
n
/gitweb-dependency' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C
Ham
a
no
Me
r
g
e branch
'jc
/
maint-
b
ranch-m
e
rgeoptions' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch 'jc/maint-add-p-
o
ver
l
appi
n
g-hunks'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyerin
g
Documentation/git-fsck
.
txt: fix typ
o
:
u
nreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
s
e
nd
-
p
ack: avoid d
e
adlock
o
n git
:
// p
u
sh with failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
connect: let
c
aller
s
know if connection is a so
c
ket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connec
t
:
treat
g
e
n
e
ric proxy processes
l
ike
s
sh proce
s
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
H
a
mano
sideband_demux(): fi
x
d
ecl-after
-
stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
t3503: test
cherry picking and
r
evert
i
ng r
o
ot co
m
mits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
rev
e
rt: allow reverting
a
root co
m
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
cher
r
y
-
p
ick: h
a
ndle ro
o
t commits
with extern
a
l
s
trategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Update draft release
n
otes
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C H
a
mano
Merge branch 'cn/
f
ormat-pat
c
h-qui
e
t'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
Merge br
a
nch
'
jm/
m
er
g
etool-submodules
'
into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
rge bran
c
h
'
j
k
/
format-pat
c
h
-quote-special-in-
f
rom
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Ham
a
no
Merge branc
h
'vh/gi
t
-
s
vn-doc' into mai
n
t
commit
|
commitdiff
|
tree
next