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
merge-recursive: Correct a comment
2011-08-14
Elija
h
Newren
merge-
r
ecursive: Correct a com
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
merge
-
recur
s
ive: Make
B
UG message more legibl
e
b
y
adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newre
n
t6022: A
d
d
t
estcas
e
for
m
erging a renamed f
i
l
e
w
it
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6022:
New
t
ests check
i
ng for u
n
necessary updates of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
w
ren
t6022:
Remove unnecessary unt
r
acked files to make test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
ren
t6036: c
r
iss-cross
+ rename/rename(1to2)/add-s
o
urce
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
036:
c
riss-cross w
/
ren
a
me/r
e
nam
e
(1
t
o2
)
/modify+r
e
name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6036: tests for
c
riss-cross m
e
rges wit
h
various directory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elij
a
h Newren
t6036:
criss-cro
s
s with
w
eird content can fool g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah
N
e
wren
t
6
036: Add
differentl
y
r
e
solved modify/delete c
o
nflic
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah New
r
en
t6042: Add
failing test
c
ases
f
or
re
n
a
m
e/ren
a
m
e/a
d
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Ne
w
ren
t6
0
42
:
Ens
u
re
rename/rename conf
l
icts
leav
e
index and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t604
2
: Add tests
f
or con
t
ent issues with
m
odify
/
ren
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
ija
h
Newren
t6042: Add a testcase where
u
ndetected r
e
name causes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah N
e
wren
t
6042: Add a pa
i
r of case
s
where u
n
d
e
tected
r
e
name
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t6042: Add fail
i
ng te
s
tcase for rename/modify/add-source
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah Newren
t6042: Add a test
c
ase
w
h
ere git delet
e
s
a
n untracked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyering
fetch
:
do not leak a re
f
spec
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Git 1
.
7
.
5
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o C Ham
a
n
o
Merge bran
c
h 'jk/maint-config
-
ali
a
s
-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C
H
amano
Merg
e
branch 'jc/f
m
t-req-fix'
i
n
to maint
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Hama
n
o
M
e
rge bran
c
h 'jk/mai
n
t-docs' into main
t
commit
|
commitdiff
|
tree
2011-06-01
Juni
o
C Hamano
Merg
e
branc
h
'jn/
d
oc-remote
-
helpers' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Haman
o
Merge branch
'
k
k/maint-pr
e
f
i
x-i
n
-config-
m
ak' in
t
o maint
commit
|
commitdiff
|
tree
2011-06-01
J
im
Mey
e
ring
diff
c
ore-rename
.
c: avoid set-
b
ut
-
not-used warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Start 1
.
7
.
5
.
4 draft release
notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 't
r
/ad
d
-i-no-escape' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Merge b
r
anch 'v
h
/config-
i
n
t
eractive-singlekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch
'ml/te
s
t-readme' into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
i
o C
Hamano
Merge branch 'ab/i18n
-
fi
x
up'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
Merge branch 'jc/rename-degrade-cc-to-c
'
into maint
commit
|
commitdiff
|
tree
2011-05-31
J
u
n
io C Hamano
Merge branc
h
'rr/d
o
c-c
o
n
t
e
n
t-type' into maint
commit
|
commitdiff
|
tree
2011-05-30
Jo
n
athan Nieder
Documentation: do not misinterpret ref
s
p
e
cs as bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Junio C H
a
man
o
Merge branch 'jm/maint-mis
c
-fix'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-30
J
unio
C
Hamano
M
erge branch
'
bc/
m
aint-submodule-fix
-
p
a
rked' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C
Hama
n
o
Merge
branch
'
bc/ma
i
nt
-
api-doc-pa
r
ked'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-30
Junio C
H
a
m
a
no
Merge branch 'jn/run
-
command-e
r
ror-failu
r
e' into main
t
commit
|
commitdiff
|
tree
2011-05-27
Junio
C
H
a
m
a
n
o
config
.
mak
.
in: a
l
low "configure --
s
ysconfdir
=
/else
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
docs: fix some antique example o
u
tp
u
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jef
f
King
docs: ma
k
e sure literal "->" isn't conver
t
e
d to
a
r
row
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f
K
ing
docs:
update status --porcelain format
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
J
eff King
docs: minor gra
m
mar fixes to git
-
status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Br
a
ndon Casey
git
-
submodul
e
.
s
h: separate par
e
n
s by a space to avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Bra
n
don Case
y
Document
a
tion/technical/api-diff
.
txt: corr
e
ct name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
K
ing
read_gitfile_gently:
use ssi
z
e_t to hold r
e
ad result
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyerin
g
re
m
o
ve t
e
st
s
of always-false condition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
rere
r
e
.
c: diagnose a corrupt MERGE
_
RR whe
n
hitting
.
.
.
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
J
u
ni
o
C
Hamano
Merge b
r
anch 'maint-
1
.
7
.
4' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o C
Ham
a
no
Merge branch 'jk/git-connection-de
a
d
l
ock-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'js
/
maint-se
n
d-pack
-
s
tate
l
e
s
s-r
p
c
-
deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
Hama
n
o
M
e
r
ge
b
ranch 'jk/maint
-
up
l
o
ad-pac
k
-shallow' into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Merge branch 'jm/maint-
d
iff-words-w
i
th-sbe
'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merge branch '
k
k
/
maint-prefix-in-config-mak' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch 'mg/diff
-
ui
c
onfi
g
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge branch 'ft/
g
it
w
eb-tar-with-gzi
p
-
n' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'ss/doc-svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Merge branch '
j
n/format-patc
h
-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merge bra
n
ch '
j
c/m
a
int-pathspe
c
-s
t
din
-
an
d
-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Mer
g
e bran
c
h 'jk/che
r
ry-pick-root-with-re
s
olve'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
M
e
r
g
e bran
c
h
'r
g
/
c
o
py-ge
c
os-u
s
ername
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
io C Ham
a
no
Merge branch 'fc
/
c
o
mpletio
n
-zsh' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
m
ano
Merge branch 'jk/git-connectio
n
-dea
d
l
o
ck-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bra
n
ch 'js/
m
aint-se
n
d-pa
c
k-stateless-rpc-d
e
adloc
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge branch 'svn-fe-maint
'
of git://repo
.
or
.
c
z
/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Juni
o
C Hamano
userf
o
rmat_find_requiremen
t
s(): fi
n
d requirement for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
N
g
uyen Thai Ngoc Duy
init/clone: remo
v
e
short
option -L and d
o
cume
n
t
--separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Juni
o
C Haman
o
han
d
le_options(): do not miscount how
m
an
y
argu
m
ents
.
.
.
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 Kin
g
config: always parse G
I
T
_
CONFIG_
P
ARAMETE
R
S
during git_config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
g
i
t
_
config
:
d
on't
peek
at global co
n
fig_paramet
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
c
o
n
fig
:
make environ
m
ent parsing ro
u
tines stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
J
im
Me
y
e
r
ing
do not
r
ead beyond end of m
a
llo
c
'd bu
f
fer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
M
ichael
J Gru
b
er
git-svn: Fix
git svn
l
og
-
-s
h
ow
-
c
o
mmit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C Hama
n
o
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jo
n
athan
Nied
e
r
p
r
ovide a co
p
y of the LG
P
L
v
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff Ki
n
g
t
est core
.
gitproxy configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
R
afael Giesc
h
ke
copy_gecos: fix not addin
g
nlen to len when
p
rocessing "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
T
h
omas
Rast
add -i: ignore termin
a
l escap
e
sequences
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merg
e
br
a
nc
h
'j
s
/
m
aint-1
.
6
.
6-send-pack-sta
t
eless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draft releas
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
Merge bran
c
h 'jn
/
maint-format-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch
'
s
s/cherry-pi
c
k-x-d
o
c'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge b
r
anch 'vr
/
merg
e
-base-do
c
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge bra
n
ch
'sr/maint-fas
t
-impo
r
t-tighten-
o
ption-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'jc/t1506
-
shell-
p
a
r
am-expansio
n
-
g
otch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Ha
m
a
no
Merge branch '
j
c/fix-
a
d
d
-u-u
n
merged'
i
n
t
o
m
ain
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C Hamano
Merge branc
h
'jn/gitw
e
b-depe
n
dency
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch 'jc/
m
aint-br
a
nch-
m
e
r
g
eoptions' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
M
erge bran
c
h 'jc/maint-a
d
d
-
p
-over
l
appi
n
g-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
im Meye
r
ing
Docu
m
entation/git-fsck
.
t
xt: fix typo
:
unr
e
adable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
se
n
d
-pack: avoid deadlock on git:
/
/ push with failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f
K
ing
connec
t
: let callers know if connecti
o
n is a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
conn
e
c
t: treat generic proxy processes like ssh processes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
s
i
d
e
band_dem
u
x(
)
: fix decl-after-s
t
mt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
eff King
t3
5
03: test c
h
er
r
y picking and r
e
verti
n
g root c
o
mmits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
ef
f
King
rever
t
:
a
llo
w
reve
r
ting a root commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
h
erry-pick: handle
r
oot commit
s
with external strategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
Update draft release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ham
a
no
Merge
b
ranch 'cn/format-patch-quiet
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Ha
m
an
o
Merge bra
n
ch
'
jm/m
e
r
g
e
tool-submodules' into maint
commit
|
commitdiff
|
tree
next