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 branch 'jc/fmt-req-fix' into maint
2011-06-01
Ju
n
io C Hamano
Merge branch 'j
c
/fmt-
r
eq-f
i
x' into maint
commit
|
commitdiff
|
tree
2011-06-01
Jun
i
o
C
H
a
mano
Merge branch 'jk/main
t
-docs
'
into maint
commit
|
commitdiff
|
tree
2011-06-01
Junio C Hamano
Me
r
ge branch 'jn/doc-remote-helpers' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-06-01
J
unio C Ham
a
no
Merge bran
c
h
'kk/maint-prefix-
i
n-config-mak' into maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Start 1
.
7
.
5
.
4 draft re
l
e
a
se note
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-31
J
unio C Ham
a
no
Merg
e
branch 't
r
/add-
i
-
n
o
-
escape' int
o
maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C H
a
mano
Merge
b
ranch 'vh/
c
onfig-inte
r
activ
e
-sin
g
lekey-doc
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-31
Junio C Haman
o
Merge branch 'ml/test-read
m
e'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-31
Junio C Hamano
Mer
g
e branch 'ab/i18n-fixup' i
n
to
m
a
i
nt
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
Junio C H
a
mano
Merge
br
a
nc
h
'rr
/
doc
-
content-
t
y
pe' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
e
r
g
e
branch 'jm/maint-misc-f
i
x' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio
C Hamano
Merge br
a
nch 'bc/maint-submodule-fix-
p
a
rk
e
d'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
M
erge b
r
anch 'bc/maint-ap
i
-doc-
p
arked' into maint
commit
|
commitdiff
|
tree
2011-05-30
Junio C Hamano
Me
r
ge bran
c
h 'jn/run-
c
omm
a
nd-
e
r
r
or-fail
u
re'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-05-27
Junio C Hamano
con
f
i
g
.
mak
.
in:
a
llow "co
n
figure --
s
ysc
o
nfdir=/e
l
se
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o
C
Haman
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
M
e
r
g
e branch 'maint-1
.
7
.
4
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C
Hamano
Merge br
a
n
c
h 'jk
/
g
i
t-conn
e
ction-deadlock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C H
a
mano
Merge bran
c
h
'j
s
/maint-s
e
nd-p
a
c
k
-
s
tateless-rpc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge
bra
n
ch 'j
k
/main
t
-upload-pack
-
shallow
'
i
nt
o
m
a
i
nt
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branc
h
'jm/maint-d
i
ff-wo
r
ds-with-sbe' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch 'kk/maint-p
r
efix-in-confi
g
-
mak
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C
H
am
a
no
Merge branc
h
'mg
/
diff-uiconfig-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
Hamano
Merge branch 'ft/gitweb-tar-with-gzip-n' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o C
Hamano
Merg
e
branch 's
s
/do
c
-
svn
'
into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge b
r
anch
'
jn/
f
ormat
-
patch-doc' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jc/maint-pa
t
hspec-s
t
din-and
-
c
mdline
'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge branch 'jk/cherry-pick-
r
o
o
t-with-resolve'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge br
a
nch 'rg/copy-gecos-us
e
rna
m
e'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C
Hamano
Merge bra
n
ch 'fc/completion-zsh' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
Mer
g
e branch 'jk/git-connection-de
a
dlo
c
k-fix'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
br
a
nch 'js/
m
a
int-se
n
d
-pack-state
l
ess-rpc-dead
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
M
e
r
g
e branch 'svn-fe-maint' o
f
git://re
p
o
.
or
.
cz/
g
it
.
.
.
commit
|
commitdiff
|
tree
2011-05-25
Junio C Hamano
userformat_find_requiremen
t
s():
f
i
nd requirement
f
o
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Hamano
G
it
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
u
n
io
C Hama
n
o
Merge
b
ranch 'js/maint-1
.
6
.
6-sen
d
-pac
k
-
stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Update draft rele
a
se not
e
s to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C Hamano
Merge branch 'jn/ma
i
nt-format-
p
at
c
h-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C Hamano
Me
r
ge branch 'ss/cher
r
y-
p
ick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'vr/me
r
ge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Mer
g
e br
a
nch 'sr/maint-fast-import-tighten-opt
i
o
n-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hama
n
o
Merge branch 'j
c
/t1506-shell-param-expan
s
ion-gotc
h
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge br
a
nch
'
jc/fix-add-u-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge
b
ranch
'
jn/gitweb-depe
n
d
ency' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
m
a
no
Merge bra
n
c
h 'jc
/
maint-branch-mergeoptions' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio
C H
a
mano
Mer
g
e br
a
nch 'j
c
/m
a
int
-
add
-
p
-
ov
e
r
l
apping-hunks
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
sideba
n
d
_
de
m
ux(): f
i
x decl-after-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Up
d
ate draft release no
t
es t
o
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge b
r
anch 'cn/format-patch-
q
uiet'
into main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Merge
b
ranch 'jm/mer
g
etool-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Me
r
ge branch 'j
k
/format-patch-quote-sp
e
cial-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Merge br
a
nch
'
vh/git-svn-doc' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
gi
t
_open_noa
t
ime()
:
dr
o
p unused parame
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
sha1_file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prepare for
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge branch '
a
w/main
t
-re
b
ase-i-p-no-ff' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
M
erge branch '
j
s/blame-parsename' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Haman
o
Me
r
ge branch 'gr
/
cv
s
impor
t
-alte
r
native-cvs
p
a
ss-l
o
cation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Hamano
Mer
g
e branch 'cj/
p
4merge
'
into
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch 'jk/merge-one-file-w
o
rking-
t
ree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ha
m
ano
Merge branch 'jc/f
i
x-diff-fil
e
s-unmerged'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
M
erg
e
branch 'mz/maint-rename-unme
r
ged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Ha
m
a
no
Merge branc
h
'jc/maint-1
.
7
.
4-pathspe
c
-stdin-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
H
amano
M
e
rge bra
n
ch
'
j
c/
m
aint-
1
.
6
.
6
-
pa
t
hsp
e
c
-
s
t
din-and-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setup_revi
s
i
o
ns(): tak
e
pathspec
f
r
o
m comm
a
n
d l
i
ne
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
Revert "Hono
r
$(
p
refix) set
i
n co
n
fig
.
mak* when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
t1507:
a
void "${parameter<op>'wor
d
'
}
"
inside doubl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
i
o C
H
aman
o
t370
1
:
a
dd-p-
f
ix makes th
e
last test
t
o pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
merg
e
: make bran
c
h
.
<
name>
.
mergeoptions correctly overrid
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io
C Hamano
Merge
b
r
a
n
ch 'js
/
m
a
int-1
.
6
.
6-send-pac
k
-stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
J
u
n
io C Hamano
t3701: fix he
r
e
docume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Mer
g
e
bran
c
h 'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch 'sp/maint-clear-postfi
e
lds
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-stash-oob' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merg
e
branch '
j
k/maint-u
p
lo
a
d-pack-sh
a
llow' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'dm/stash-k-i
-
p' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
M
e
rge branch
'
jc/pack
-
o
bj
e
cts-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch 'mg/refl
o
g-w
i
th-options' i
n
t
o
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch 'jk/stash
-
loosen-safet
y
'
into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Mer
g
e branch
'
ar/cle
a
n-rm
d
ir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
no
Merg
e
branc
h
'mg/sha1
-
path-advise' into m
a
int
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hama
n
o
"add -
p
": w
o
rk-a
r
ound an
o
ld laziness that do
e
s
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hama
n
o
a
d
d--in
t
e
ract
i
ve
.
p
e
rl: factor
o
u
t rep
e
ated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
t3701:
E
d
iting a split
h
unk in an "add -p"
session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C
Hamano
ad
d
-
p
: 'q' should real
l
y qu
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C Hamano
Sta
r
t
1
.
7
.
5
.
1 maintenan
c
e track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
Merge branch
'mg
/
x-years-12-months' into main
t
commit
|
commitdiff
|
tree
2011-04-26
J
un
i
o
C Ham
a
no
h
t
tp
:
clear POSTFI
E
LDS when initializing a
s
l
ot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Junio C H
a
mano
M
erge
b
ranch
'js/maint-1
.
6
.
6-s
e
nd-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hama
n
o
G
i
t
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io
C
Haman
o
Fix "add
-u"
that sometimes fails to
r
esolve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C
H
amano
diff-files: show un
m
erged entries c
o
rrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
a
ma
n
o
diff: remove
o
ften un
u
sed
parameters from dif
f
_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
diff
.
c: return filepair f
r
om
d
iff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
te
s
t
: use $
_
z40
from
test
-
lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Haman
o
Git
1
.
7
.
5-rc
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Hamano
Sync w
i
th 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
m
an
o
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next