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
t6036: criss-cross with weird content can fool git into clean merge
2011-08-14
Elijah Newr
e
n
t
6
036: criss-c
r
oss
with weird
cont
e
nt can fool git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
e
n
t
6
036:
A
dd
d
ifferently
res
o
lved modify/de
l
ete confli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add failin
g
testcases for rename/ren
a
me/add
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
j
ah N
e
wren
t60
4
2: Ensure ren
a
me/rename conflict
s
le
a
v
e index and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6042
:
Add tests
f
or cont
e
nt issues wi
t
h modify/rename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t
6042: Add
a
te
s
tcase where
u
ndetected rename
c
a
uses
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6042: Ad
d
a pair o
f
cases where
undetected renames
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6
0
4
2: Add failing testc
a
se for rename/mo
d
ify/a
d
d
-s
o
urce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
N
ewren
t6042: Add a
test
c
ase w
h
ere
git deletes an untracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim
M
eyering
fetc
h
:
do not leak a refs
p
ec
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
Ju
n
io
C
Hamano
Merge
b
ranch 'jk/maint-config-alias-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hama
n
o
M
erge branch 'jc/fmt-req-fix'
i
n
to main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
Hamano
M
e
rge branch '
j
k/ma
i
nt-docs' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o
C Hamano
Merge bra
n
ch 'jn/
d
oc-rem
o
te-helpers' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C Hamano
Merge branch 'kk/maint-pre
f
ix-i
n
-config-mak' int
o
maint
commit
|
commitdiff
|
tree
2011-06-01
Ji
m
Meye
r
ing
diffcore
-
rename
.
c
: avoid se
t
-but-no
t
-used warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hama
n
o
Start 1
.
7
.
5
.
4 dr
a
ft releas
e
notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ham
a
no
Mer
g
e bran
c
h 'tr/add-i
-
no-escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Me
r
ge branch
'vh/co
n
fig-interactive-si
n
g
l
ekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch
'
m
l/test-readme' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge branch 'ab/i18n-fixup' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
H
ama
n
o
Merge branch 'jc/rename-degrad
e
-c
c
-
to
-
c' into
maint
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Merge branch
'rr/
d
oc-content-type' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nie
d
e
r
Documentati
o
n: do not misinterpret refspecs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
J
uni
o
C Hamano
Merge
b
ranch 'jm/maint-mi
s
c-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-30
J
u
nio C
Ham
a
no
M
e
rge
b
ranch
'bc/mai
n
t-
s
ubmodule-fix-
p
arked' into
maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merg
e
b
ranch 'b
c
/maint-api-
d
o
c-parked' into
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C Hamano
Me
r
ge
bran
c
h 'jn/run-command-error-failure' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-27
Ju
n
io C Hama
n
o
config
.
mak
.
in:
a
l
l
ow "con
f
ig
u
re
-
-
sysconf
d
ir=/e
l
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
Ki
n
g
d
o
cs: fix some antique example ou
t
p
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: make sure literal "-
>
" isn't conver
t
ed to arr
o
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
docs:
u
pdat
e
st
a
t
u
s --porcelain format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
docs:
m
in
o
r
gr
a
mmar fixes to git-st
a
tus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Cas
e
y
git-submodule
.
s
h
: se
p
ara
t
e parens b
y
a space t
o
a
v
oid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Ca
s
e
y
Documen
t
atio
n
/tec
h
nica
l
/api-diff
.
t
xt: correct na
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Je
f
f King
read_gitfile_gently:
use ssize_
t
to hold
read
r
e
s
ult
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim M
e
yer
i
ng
remove tests of
a
l
ways-
f
a
lse c
o
ndition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Ji
m
Mey
e
ring
re
r
ere
.
c: diagnose a corrup
t
MERGE_RR when hitting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hama
n
o
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge bra
n
ch
'
ma
i
nt-1
.
7
.
4' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Merge branch 'jk/g
i
t-con
n
e
ction-deadlock-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Haman
o
Merge branch
'
js/
m
aint-s
e
nd
-
pack-statele
s
s-
r
pc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hama
n
o
Merge branch
'jk/m
a
int-upload-pack-sha
l
low' into
m
a
i
n
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branc
h
'
j
m/main
t
-
d
iff-words-wit
h
-sbe' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
Hamano
Merge bran
c
h
'
k
k/main
t
-
pr
e
f
ix-i
n
-c
o
nfig-
m
ak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e
b
ranch
'mg/diff-uiconf
i
g-doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge bran
c
h 'ft/gi
t
web-tar-w
i
th-gzip-n
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge b
r
anch 'ss/doc-svn' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merg
e
branch 'j
n
/format-p
a
tch-do
c
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Merge branch 'jc/maint-pathspec-stdin-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
H
am
a
no
Merge br
a
nch 'jk/cherr
y
-pick-root
-
with-resolve' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge branch
'
rg
/
c
o
py-gecos-
u
sername' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
H
amano
Mer
g
e
bra
n
ch 'fc/com
p
letion-zsh' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge b
r
anch 'jk/git-connecti
o
n
-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
M
erge
b
ranch 'js
/
maint-s
e
nd-
p
ack-stateless-rpc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Ha
m
ano
Merge branch 'sv
n
-fe
-
maint
'
of git
:
//r
e
p
o
.
or
.
cz/gi
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
J
unio C Hama
n
o
userforma
t
_f
i
nd_require
m
ents(): fi
n
d re
q
uirement for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
N
g
uy
e
n
Thai
Ngo
c
Duy
i
n
it/clone: remove short optio
n
-L a
n
d
document --separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Hamano
h
a
ndle_options():
d
o not misco
u
nt how many ar
g
uments
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jef
f
Ki
n
g
config:
always pa
r
s
e
GIT_CONFIG_PARA
M
ETERS during
git_co
n
f
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
g
i
t
_
co
n
f
i
g:
don't pee
k
at
glo
b
a
l co
n
fig_parameters
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
J
e
ff King
config: make envi
r
onment p
a
r
s
ing routines static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jim Meyer
i
ng
d
o not
r
ead be
y
o
nd end of malloc'd
b
uff
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
g
it-
s
vn: Fix git
svn
l
o
g
--show-com
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Gi
t
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
onathan Nieder
provide a
c
opy of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff K
i
ng
test core
.
gitp
r
oxy config
u
ration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
R
a
f
ael Gieschke
cop
y
_ge
c
o
s:
fix not
ad
d
ing nlen
t
o
l
en when processing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
T
h
o
m
as Rast
a
d
d -
i
: i
g
nore termin
a
l
e
s
c
a
pe sequen
c
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merg
e
bra
n
c
h '
j
s/main
t
-1
.
6
.
6-send-pack-s
t
ateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update d
r
aft 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 H
a
man
o
Merge b
r
anch
'
jn/
m
ain
t
-
f
ormat-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Mer
g
e
bra
n
ch
'ss
/
cherry-pick
-
x-doc
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
ano
Mer
g
e
branc
h
'vr/merge-ba
s
e
-
do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C Hamano
M
erg
e
branch 'sr/maint-fa
s
t-impo
r
t
-
tighten-opt
i
o
n
-
pars
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
an
c
h 'jc/t150
6
-shell-param-expansion
-
gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/fix-add-
u
-unme
r
ged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jn/gi
t
we
b
-dependency'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
M
e
r
g
e
branch 'jc/maint-b
r
anch-m
e
rgeopt
i
ons' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C
Hama
n
o
Merge branch 'j
c
/m
a
int-a
d
d-p-overlapping-hunks'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documentation/git-fsck
.
txt: fix typo: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-pack: av
o
id dea
d
lock on git:// push with failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Kin
g
c
o
nnec
t
: let callers
kn
o
w
if
c
o
nnect
i
on
i
s a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
con
n
ect: treat ge
n
eric proxy
p
rocesses
l
ike ssh
processes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
s
i
d
eba
n
d_de
m
ux(): fix decl-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
t
350
3
: test che
r
r
y
pick
i
n
g and rev
e
r
t
ing root
c
ommits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
reve
r
t:
a
llow reverting a r
o
ot comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
c
h
e
r
ry
-
pick: handle root commits with external str
a
te
g
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
U
p
date draft
r
e
l
ease
n
otes
to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge bra
n
ch 'cn/format-patch-
q
uiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge branch '
j
m/mergeto
o
l-sub
m
od
u
les' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
a
no
M
erge
branch 'jk/format-patch-quote-specia
l
-
i
n-
f
ro
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Me
r
ge branc
h
'vh/git-svn
-
doc'
into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
git_o
p
en_n
o
atime(): drop
u
nu
s
ed p
a
rameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hama
n
o
sha1_file: ty
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan N
i
e
d
er
add, m
e
r
g
e, d
i
ff: do
n
ot
u
se strcasec
m
p to
c
ompare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C H
a
mano
Pre
p
are for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C Hamano
Merg
e
branch
'aw/maint-re
b
as
e
-i-p-no-ff' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Mer
g
e
bra
n
c
h
'js/blame-pa
r
senam
e
' into maint
commit
|
commitdiff
|
tree
next