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-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
Ju
n
io C Hamano
Me
r
ge branch
'jk
/
main
t
-config-alias-fix'
i
nto maint
commit
|
commitdiff
|
tree
2011-06-01
Junio
C
Hamano
M
e
rge bra
n
c
h
'
jc/
f
mt-req-fix' into main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Merge branch 'jk
/
maint-docs'
i
nto main
t
commit
|
commitdiff
|
tree
2011-06-01
Junio
C Haman
o
Merge branch 'jn/doc-re
m
o
t
e-helpers' into maint
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Hamano
Merge branch '
k
k
/
maint-prefi
x
-in-
c
onfig-mak' into maint
commit
|
commitdiff
|
tree
2011-05-31
Jun
i
o C H
a
mano
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
Ham
a
no
Me
r
ge branch 't
r
/add-i-n
o
-es
c
ape' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge bran
c
h 'vh
/
con
f
ig-interactive-s
i
nglekey-doc
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio
C
Hamano
Merge branch 'm
l
/
t
est-readme' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Mer
g
e branch 'ab/i18n-fixu
p
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merge branch 'jc/
r
ename-de
g
rade-c
c
-to-c' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Merg
e
bra
n
c
h
'
rr
/
doc-conten
t
-type' into maint
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C Hamano
Me
r
ge branch 'jm/maint-misc
-
fix' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Ha
m
ano
Merge
branch '
b
c/maint-submodule-fix-parke
d
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-30
Juni
o
C Ha
m
a
n
o
M
e
rge branch 'bc/maint-api-doc-
p
arked' into main
t
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C
Hama
n
o
Merge
b
r
anch 'jn/run-co
m
mand-error-failure'
into maint
commit
|
commitdiff
|
tree
2011-05-27
Jun
i
o
C Hamano
config
.
mak
.
in:
al
l
o
w
"configure
-
-
s
y
sconfdir=
/
e
l
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Git 1
.
7
.
5
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
M
erge b
r
anch '
m
aint-1
.
7
.
4' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Haman
o
Merge br
a
nch 'jk/git-conne
c
tio
n
-deadlock-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
branch 'js/maint-send-pack-st
a
t
e
less-rp
c
-de
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Haman
o
Mer
g
e
branc
h
'jk/main
t
-uploa
d
-pack
-
shallow' into maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Me
r
ge branch 'jm
/
maint
-
d
i
ff-words-w
i
th-sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranch 'kk/maint-prefix-in-config-ma
k
' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o
C Hamano
Merge branch 'm
g
/diff-uiconfig-doc
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'ft/gitweb-ta
r
-with-gzip-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C
Ha
m
ano
Merge br
a
nch 'ss/doc-svn' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hama
n
o
M
e
rge branch 'j
n
/format-patch-doc' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merg
e
br
a
nch 'jc/ma
i
nt-pat
h
spe
c
-stdi
n
-and
-
cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
M
e
rge branch
'
j
k/cherr
y
-p
i
ck
-
root-with-resolve'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge b
r
anch 'rg/copy-gecos-u
s
ername'
into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merge branch 'fc/co
m
pletion-
z
sh' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hama
n
o
Mer
g
e branch 'jk/git-co
n
n
ectio
n
-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
M
e
rge branch 'js
/
maint
-
send
-
pac
k
-stateless-rpc
-
deadl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge branc
h
'svn-fe-maint'
o
f
git://repo
.
o
r
.
c
z/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Hamano
userforma
t
_fin
d
_r
e
q
u
irements(
)
: find requi
r
ement for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-24
Junio C
H
ama
n
o
hand
l
e_options(): do not
m
iscount how ma
n
y 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-20
Junio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
M
e
rg
e
branch 'js/ma
i
nt-1
.
6
.
6-s
e
n
d-pack-stateless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
U
p
date draft release no
t
e
s to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jn/ma
i
n
t-format-patch-doc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
r
a
nc
h
's
s
/cherry-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C
H
amano
Merge branch 'vr/merge-base-do
c
' i
n
t
o
m
ain
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
r
g
e
br
a
nch 's
r
/maint-fast-import-tighten-option-parsi
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Haman
o
Merge br
a
nch
'
j
c/t1506-s
h
ell-par
a
m-exp
a
nsion-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge branch 'jc/fix-add-u-u
n
merged' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'jn/g
i
tweb-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Me
r
ge branch
'jc
/
mai
n
t
-branch
-
mergeoptions' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ranc
h
'jc
/
mai
n
t-
a
d
d-p-
o
verlapping-h
u
nks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband_demux(): fix
d
ecl-after-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
a
ma
n
o
Update draft
r
elease
n
ote
s
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
ama
n
o
Merge b
r
anch
'cn/
f
ormat-pat
c
h-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Ham
a
no
Merge bra
n
c
h 'jm/mergeto
o
l-submo
d
ules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C H
a
mano
Merge
b
ranch 'jk/format
-
patch-quote-spe
c
ial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Mer
g
e bra
n
ch 'vh/g
i
t-svn-
d
o
c
' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hama
n
o
git_open_noatime()
:
drop u
n
us
e
d parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
sha1_file:
typo
f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Prepa
r
e fo
r
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
Merge branch
'
aw/maint-rebase-i-p-no-ff'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
Hamano
Merge branch 'js/blame
-
parsename' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merg
e
branch 'gr/cvsimpo
r
t-a
l
ternative-cvspa
s
s-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ham
a
n
o
Merge branch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Haman
o
Mer
g
e b
r
a
n
ch 'jk
/
merge-one-file-w
o
rking-tree'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Me
r
ge
branch 'jc/fi
x
-diff-files-unmerged' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C Hama
n
o
M
erge branch 'mz/maint-ren
a
me-unmerge
d
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Merge branch 'jc/main
t
-1
.
7
.
4-pathspec-st
d
in-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
mano
Merge branch
'jc/maint-1
.
6
.
6-path
s
pec-stdin-and-
c
m
d
l
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
se
t
up_revisions(): tak
e
paths
p
ec f
r
om c
o
mmand line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C Hamano
Revert
"
Ho
n
or $(pre
f
ix)
set in
c
o
n
f
ig
.
m
a
k* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Ju
n
i
o
C Hamano
t
1
507: avoid "$
{
parameter<op>'word'}" inside
d
oubl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
u
nio C
Hama
n
o
t3701: add-p
-
f
ix makes t
h
e last t
e
st to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
m
e
rge:
make
branch
.
<
n
ame>
.
mer
g
e
o
p
t
ion
s
correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C Hamano
Merge b
r
anch
'
js/maint-
1
.
6
.
6
-send-pack
-
st
a
teless-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701:
fix
h
ere document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e bran
c
h 'j
h
/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge branch 'sp/
m
aint-cl
e
ar-postfiel
d
s'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Mer
g
e b
r
anch 'jk/maint-st
a
sh-
o
o
b' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge bran
c
h 'jk/
m
aint-uplo
a
d-pack
-
shal
l
ow' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
ma
n
o
Merge branch
'
dm/stash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Hamano
M
e
rge branch 'jc/pack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
M
e
rge branch
'mg/reflog-with
-
o
p
t
i
on
s
'
i
nt
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch 'jk/stash
-
loosen-safety' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
m
ano
Merge branch 'ar/clean-rmdir-empty' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branc
h
'
mg
/
sha1-path-advise
'
i
n
to
maint
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
"add -p": work-aroun
d
an
o
ld lazi
n
ess that does n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add--intera
c
tive
.
perl: factor out repe
a
ted --reco
u
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3
7
01: E
d
iti
n
g a split hunk i
n
an "add -p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
io
C
Ha
m
ano
a
dd
-p: 'q' should really q
u
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
S
t
art 1
.
7
.
5
.
1 mai
n
t
enance tra
c
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
M
e
r
ge branc
h
'mg/x-yea
r
s-12-months' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-26
Junio
C H
a
m
ano
h
ttp: clear POST
F
IELD
S
when
i
n
itializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Hama
n
o
Merge branc
h
'
j
s/maint-1
.
6
.
6-send-pack-statel
e
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
i
o C
H
a
mano
Fix
"add -u"
t
hat sometimes fails to re
s
olv
e
u
nmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff-files: show unme
r
ged entries correc
t
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C
Hamano
dif
f
: remov
e
often
unused parameter
s
f
rom di
f
f_un
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
a
m
ano
diff
.
c: return f
i
lepa
i
r from di
f
f_unmerg
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
t
est: use
$
_z40 from test-l
i
b
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next