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: Add failing testcase for rename/modify/add-source conflict
2011-08-14
Elijah N
e
wren
t6042:
A
dd
f
ail
i
ng test
c
a
s
e
for r
e
nam
e
/modify/add-sour
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-08-14
E
lijah
Newren
t6
0
4
2
:
Add a te
s
tcase where git
del
e
tes an untrack
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-06-09
Jim Meyering
fetch:
do
not
l
eak 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
Jun
i
o C
H
a
man
o
Merge b
r
anch '
j
k/maint-conf
i
g-alias-fix' into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
M
e
rge br
a
nch 'jc/fmt-req-fix' in
t
o maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
aman
o
Merge branch 'jk/maint-docs'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C
H
a
mano
Merge branch 'jn
/
doc-remot
e
-helpers' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o
C
Hamano
Merge bran
c
h '
k
k/mai
n
t
-
prefix-i
n
-confi
g
-mak' into maint
commit
|
commitdiff
|
tree
2011-06-01
Ji
m
Meye
r
in
g
d
iffcore-rename
.
c: avoid set-but-
n
ot-used
w
arnin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
Start 1
.
7
.
5
.
4
dr
a
ft rel
e
ase notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-31
Juni
o
C Hamano
Merge
branch 'tr
/
add-i-n
o
-es
c
ape'
into main
t
commit
|
commitdiff
|
tree
2011-05-31
Junio
C Hamano
M
e
rg
e
bra
n
ch 'vh/config-interactiv
e
-singleke
y
-do
c
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Ha
m
a
no
M
e
rge
b
r
a
nch '
m
l
/test-readme' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o
C Hamano
Merge bra
n
ch 'ab/i18n-fixup' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Ju
n
io C Hamano
Merge branch
'
jc/rename-deg
r
ade-cc-to-c
'
into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge bran
c
h
'rr/
d
oc-content
-
type' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-30
Jona
t
han Nieder
Documentation: do no
t
misin
t
e
rp
r
et refspecs as bold
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C Hamano
Merg
e
branch 'j
m
/maint-misc-fix' int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C
Hamano
Merge b
r
anch '
b
c/
m
a
i
nt-su
b
module
-
fix-park
e
d' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-30
J
unio C Haman
o
Mer
g
e branch
'b
c
/maint-api-
d
o
c-parked' int
o
maint
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C
H
a
mano
Merge branch 'jn/run-command-error-failure
'
int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-27
Jun
i
o C Hamano
config
.
mak
.
i
n: allow "confi
g
ure --sysco
n
fdir=/else
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
Jeff K
i
ng
docs: fix
some antique example output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
eff Ki
n
g
d
o
c
s
: make sure litera
l
"-
>
"
i
s
n't converted
t
o arrow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
eff King
docs
:
update status --porcel
a
in form
a
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-27
J
e
ff
K
i
ng
do
c
s: minor grammar fixes to
git-sta
t
us
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Bra
n
don Casey
gi
t
-sub
m
odule
.
sh: separate
p
ar
e
n
s by a space to avoid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Brandon Cas
e
y
Docu
m
e
n
tation/tec
h
nical/api-diff
.
txt: correct
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jeff King
read_gitfil
e
_gently: use ss
i
ze_
t
to ho
l
d read
r
esult
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim Meyering
remo
v
e
tes
t
s of always
-
f
al
s
e conditio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Jim
M
eyering
rerer
e
.
c
:
dia
g
nose a corrupt M
E
RGE_RR when hi
t
t
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge branch 'maint-1
.
7
.
4
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
bra
n
ch '
j
k/git-connec
t
io
n
-deadlock-fix'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge branch 'js/maint-send-pa
c
k-stat
e
less-rpc-dea
d
l
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/maint-upload-pac
k
-shal
l
ow'
into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
b
ranch
'
jm/mai
n
t-diff-words-with-sbe' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
a
n
o
M
erge
branch 'kk/maint-
p
refi
x
-
i
n
-c
o
nfig-m
a
k' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
Merge branch 'mg/dif
f
-
u
iconfi
g
-
do
c
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge branch 'ft/git
w
e
b-ta
r
-w
i
th-gzip-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
M
erge branch
'
ss
/
doc-svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
H
amano
Merge
branch 'jn/format-patch-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
ama
n
o
Merge br
a
nch 'jc
/
m
a
i
nt-pathspec-s
t
din-and-cmd
l
in
e
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
amano
M
erge bran
c
h 'jk/
c
h
e
rry-pick-
r
o
ot-with
-
r
eso
l
ve'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Ha
m
ano
Merge bra
n
ch '
r
g/copy-gecos-
u
s
e
rname' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
M
erge branch 'f
c
/completi
o
n-zsh' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
Me
r
ge branch 'jk/g
i
t-connection-deadlock-fix'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o
C Ham
a
no
Me
r
ge branch
'j
s
/ma
i
nt-send-pack-st
a
t
el
e
ss-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merg
e
branch 'svn-
f
e-
m
a
int' of git
:
//
r
e
po
.
or
.
cz/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Ham
a
n
o
use
r
form
a
t_find_requireme
n
t
s()
:
f
ind r
e
quir
e
ment for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-25
Nguyen
Thai N
g
o
c
Duy
init/c
l
one
:
r
emove sh
o
rt
o
ption
-
L a
n
d docume
n
t --separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C Ham
a
no
h
a
ndle_op
t
i
o
ns(): do not misco
u
nt how man
y
arguments
.
.
.
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
K
i
ng
config: always parse
GIT_CONFIG_PAR
A
M
E
TERS
du
r
ing git_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Jeff King
git_config:
don't pe
e
k a
t
global
c
onfig_par
a
meters
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 M
e
yering
do n
o
t read
beyond end of malloc'd b
u
ffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Mic
h
a
el J Gruber
gi
t
-sv
n
:
F
ix git svn log --show
-
co
m
mi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hama
n
o
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
on
a
t
ha
n
Nieder
provide a copy of the LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
t
e
st core
.
gitproxy
c
o
nfi
g
uration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
R
afael Gi
e
schke
copy_gecos: fix not adding n
l
en to len
when processin
g
"&
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Thomas R
a
st
add -i: ign
o
re t
e
rmina
l
escape sequences
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio
C
Hamano
Mer
g
e branch
'
js/maint-1
.
6
.
6-send-pack
-
st
a
te
l
ess-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draft relea
s
e notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
M
e
r
ge branch 'jn/maint-format-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge
bra
n
ch 'ss
/
cherry-
p
ick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch 'vr/
m
erge-base-d
o
c'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Me
r
ge
b
ranch 's
r
/maint-f
a
s
t
-import-tight
e
n-op
t
ion-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Hamano
M
e
rge branch 'j
c
/t150
6
-shell
-
pa
r
am-expansion-gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Mer
g
e br
a
nch 'jc/fix-add-u-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C Hama
n
o
M
e
rge
branch 'jn/gitw
e
b-depende
n
cy' i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
no
Merg
e
branch
'jc/
m
ain
t
-branch-mergeoptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch
'
jc
/
maint-add-p
-
overlapping-hunks' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
im Meye
r
in
g
Do
c
ument
a
tion/git-fsck
.
txt: fix
t
ypo: u
n
readable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
se
n
d
-pack: avoid dea
d
loc
k
on gi
t
:// pu
s
h with
failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
onnect:
l
e
t
c
a
ller
s
know if con
n
ection i
s
a
so
c
ket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
con
n
ect: trea
t
gene
r
ic p
r
oxy pr
o
cesses
like
ssh p
r
oc
e
sses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Ham
a
no
si
d
eband_demux(): fix decl
-
aft
e
r-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t350
3
: test cher
r
y picking and reverting
r
oot
c
ommits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert: al
l
ow re
v
ert
i
ng a root com
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
cherry-pick:
ha
n
dle r
o
ot com
m
i
t
s
w
i
t
h ext
e
r
n
a
l strate
g
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
io
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
Junio C Hamano
Merge branch 'cn/format-p
a
tc
h
-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Merge branch 'jm/me
r
g
e
tool
-
submo
d
ules'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge bra
n
ch 'jk/form
a
t-
p
atch-qu
o
te-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge bran
c
h
'
v
h/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C H
a
mano
git_open_noatime(): drop unused pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Haman
o
sha1_
f
ile: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonath
a
n Nied
e
r
add, merge, diff: do not use st
r
casecm
p
to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
Hamano
Merge b
r
an
c
h
'
a
w/maint-rebase
-
i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge bra
n
ch
'
js/b
l
am
e
-par
s
ename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
mano
Merge b
r
anch
'
gr/
c
vsi
m
port-al
t
e
rn
a
tive-cvsp
a
ss-locat
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'cj/p4mer
g
e' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ra
n
ch 'jk/
m
erge-one-file-work
i
n
g
-tre
e
' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'jc/fix-diff-files
-
u
nm
e
r
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e branch 'mz/main
t
-re
n
ame-unmerged
'
in
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Johan Herl
a
nd
t54
0
0
:
F
ix a co
u
p
le of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Hamano
Merge branch 'jc/maint-1
.
7
.
4
-
p
a
t
hspe
c
-stdin-and-cmdline'
commit
|
commitdiff
|
tree
next