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
t6042: Ensure rename/rename conflicts leave index and workdir in sane state
2011-08-14
El
i
jah Newren
t6042: Ens
u
re r
e
n
ame
/
rename conflic
t
s leave i
n
dex a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Newren
t
6
042:
A
dd test
s
for content iss
u
es w
i
th modify/re
n
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elijah Ne
w
r
en
t
6
0
4
2: A
d
d
a
testcase where
u
nde
t
ected rename causes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
El
i
jah Newren
t6042: Ad
d
a pair of cases where un
d
etecte
d
renames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
Elija
h
Newren
t60
4
2:
Add
f
ailing
t
estcase fo
r
rename/modif
y
/add-
s
ource
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-08-14
E
l
i
jah Ne
w
ren
t6
0
42: Add a test
c
ase where git de
l
etes a
n
untracke
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-06-09
J
i
m Meyering
fetch: d
o
not leak a refspec
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
ni
o
C
Hamano
Merg
e
br
a
nch 'jk/main
t
-conf
i
g-ali
a
s-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C Hamano
Merge branch 'jc/fmt-req-
f
ix' into
maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge
branc
h
'jk/
m
aint-
d
ocs' into m
a
in
t
commit
|
commitdiff
|
tree
2011-06-01
Junio
C Ha
m
ano
M
e
r
g
e
bra
n
c
h
'jn/doc-rem
o
te-helpers' into
maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Ha
m
ano
Merge br
a
nch 'kk/maint-prefix-i
n
-c
o
nfig-mak' i
n
to maint
commit
|
commitdiff
|
tree
2011-06-01
J
i
m Meyering
diffc
o
re-re
n
ame
.
c
:
a
v
oid set-but-not-used w
a
rning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C Hamano
S
tart 1
.
7
.
5
.
4
d
raft release
n
otes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
M
e
r
ge branch 'tr/add-i-no-escape' into maint
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hama
n
o
Merg
e
bra
n
ch '
v
h/c
o
nfig-interactive-singlekey-doc'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Hamano
M
e
rge bran
c
h
'ml/test-readme' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Merge
bra
n
ch 'ab
/
i18n-fixup' i
n
t
o
main
t
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
M
e
rg
e
bran
c
h 'jc/rename-degrade-cc-to
-
c' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C
Hamano
M
erge br
a
nch '
r
r/d
o
c-content-type' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-30
Jonathan Nie
d
er
D
o
cumentation: d
o
not
m
isin
t
erp
r
e
t refspecs
a
s bold
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
i
o
C Hamano
Mer
g
e branch 'jm/maint-mis
c
-fix
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Merge branch '
b
c
/
maint-submod
u
le-f
i
x-pa
r
ked' into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
J
u
n
io C Ham
a
no
Merge
b
r
anch 'bc/maint-api
-
doc-park
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C Hamano
Me
r
ge br
a
nch 'jn/run-command-erro
r
-f
a
i
lure' into
m
aint
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
config
.
mak
.
i
n: a
l
l
o
w "configure --s
y
sconfdir=/el
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff King
docs: fix some
a
n
tiq
u
e example
o
utpu
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff
K
ing
docs: make sure lit
e
ra
l
"
-
>
"
isn't converted to a
r
row
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Jeff King
docs: update sta
t
us --p
o
rcelai
n
forma
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-27
Je
f
f
King
do
c
s: mi
n
o
r
g
r
a
mmar fixes
to git-status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
g
i
t-
s
ubmodule
.
sh
:
separate
p
are
n
s by a sp
a
ce
t
o avoid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Casey
Docume
n
tation/tech
n
ical/a
p
i
-di
f
f
.
txt: correct name
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jeff
King
rea
d
_gitfile_gent
l
y:
u
se s
s
ize_t
t
o hold read r
e
sult
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyerin
g
remo
v
e tests of always-fal
s
e
c
ond
i
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meye
r
i
ng
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
Junio C Hamano
Git 1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
unio C
Haman
o
Merge branch 'maint-1
.
7
.
4' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
H
amano
Merg
e
bran
c
h 'jk/git-connectio
n
-d
e
adlock-fi
x
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Haman
o
Merge bran
c
h 'js/m
a
int-sen
d
-pack-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/maint-uplo
a
d-pac
k
-shallow' i
n
to main
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
H
amano
Merge branch 'jm/maint-d
i
f
f
-words-with-sbe' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
bran
c
h 'kk/m
a
int-pref
i
x-in-c
o
nfig-ma
k
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
M
erge branch 'mg/diff-uic
o
n
f
i
g
-
do
c
' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
a
n
o
M
e
rge branch 'ft/git
w
eb-tar-
w
it
h
-gzip-
n
' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Ham
a
no
M
erge branc
h
'ss/doc-svn'
i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merge branc
h
'jn/
f
ormat
-
p
a
tc
h
-
d
oc' into m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch
'
jc/
m
aint-pathspec-s
t
din-and-cmdlin
e
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Me
r
g
e
b
r
anch 'jk/cherry-pick-root-with-
r
esolv
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
Ham
a
n
o
Merge branch '
r
g/copy-gecos-
u
sernam
e
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erg
e
branch 'fc/completion-zsh' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Ha
m
a
n
o
Me
r
ge branc
h
'jk/git-connecti
o
n-
d
eadlo
c
k
-
fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'js/maint
-
send-pack-state
l
e
s
s-rpc-de
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
M
e
rge branch 'svn-fe-main
t
' of g
i
t://repo
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C H
a
mano
u
se
r
for
m
at_find_requirements():
find r
e
quirement for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-25
Nguy
e
n Thai Ngoc Duy
in
i
t
/clone: remove short option -L and docu
m
ent --separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
J
u
nio C Hamano
h
a
ndle_
o
ptions(): do not miscou
n
t how m
a
ny 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
Je
f
f Kin
g
co
n
fig: always parse GIT_CON
F
IG_PARAMETERS during git
_
config
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Je
f
f King
git_config: do
n
'
t pee
k
at g
l
oba
l
c
onfig_parameter
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
con
f
ig: make environment parsing
r
outines stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jim M
e
yering
do not read beyon
d
end
of m
a
lloc'd buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Michael J Gruber
git-sv
n
: Fix
git svn l
o
g --show-commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
Gi
t
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
provide a copy of the LG
P
L
v
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
J
e
ff
K
ing
test core
.
gitproxy configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Rafael Gie
s
chke
copy_geco
s
: fix not adding
n
len to
le
n
when processi
n
g "&"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Th
o
mas Rast
add -i: ig
n
o
r
e termin
a
l
e
scape sequences
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C H
a
man
o
Merge
branch 'j
s
/maint-1
.
6
.
6-send-p
a
ck-stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
m
an
o
Upda
t
e draft release notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
M
erg
e
branch
'jn
/
maint-format-patch-doc'
i
nto
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Hamano
Merge bran
c
h '
s
s/
c
herry-
p
ick-x-doc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'vr
/
m
e
r
ge-b
a
se-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge
b
r
anc
h
'sr/maint-fast-impo
r
t-tigh
t
e
n
-option-pa
r
sin
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
Merg
e
bran
c
h 'jc/t1506-s
h
ell-param-expansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge
b
ranch 'j
c
/fi
x
-add-u-unmerged' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
i
o
C
H
amano
Merge branch 'jn/gitweb-dependency'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
M
e
rge bra
n
ch 'jc/maint-branch-mergeop
t
ions' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
uni
o
C Hamano
Me
r
ge bran
c
h
'jc/m
a
int-add-p
-
overlapping-hunk
s
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
i
m M
e
y
e
ring
Documen
t
ation/gi
t
-
f
sck
.
txt:
fix typo: un
r
ea
d
abl
e
-
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
s
e
nd-pack
:
avoi
d
deadlo
c
k on git:// push with failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
conne
c
t: let
callers know if
connection is a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff Ki
n
g
c
o
nnect:
t
re
a
t gen
e
r
i
c
pro
x
y
p
roc
e
sses l
i
ke ssh
p
ro
c
esses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband_demux(): fi
x
decl-
a
fter-st
m
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
Ki
n
g
t35
0
3: test cherry picking and rever
t
ing root commi
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert:
a
ll
o
w revertin
g
a ro
o
t
comm
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
h
er
r
y-pick: handle root
c
ommits with external strate
g
ies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
Hama
n
o
U
pda
t
e draft releas
e
notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
M
e
rge b
r
a
n
ch 'cn/format-patch-quiet
'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merg
e
bra
n
ch 'jm/mer
g
etool-submodules'
i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
H
amano
Merge branch 'jk
/
format-patch
-
qu
o
t
e-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge
b
ranch 'vh/git-s
v
n
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
git_open
_
noatime()
:
drop unused p
a
rame
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
s
ha1_file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan N
i
eder
add, merge, d
i
ff: do not use strcasecmp to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
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
nio
C
Hamano
Merg
e
branch 'aw/maint-re
b
ase-
i
-p-no-ff' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Hamano
Merge branch 'js/blame-parse
n
ame'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Merge b
r
anch 'gr/cvsimp
o
rt-a
l
ternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge b
r
anc
h
'cj
/
p4merge'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
M
e
rge branch 'jk/merge-one-
f
ile
-
working-tree' into
.
.
.
commit
|
commitdiff
|
tree
next