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 'ss/cherry-pick-x-doc' into maint
2011-05-16
Junio C Haman
o
Merge
b
ranc
h
's
s
/cherry-pick-x-doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
a
m
an
o
Merg
e
b
ranch 'vr/mer
g
e-ba
s
e-doc' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C
Ham
a
no
Mer
g
e branch
'
sr
/
m
aint-fast
-
import-t
i
ghten-opt
i
on-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge br
a
nch 'jc/t1506-shell
-
pa
r
am-expan
s
i
o
n-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merg
e
branch 'j
c
/fix-add-u-unm
e
r
ged' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
H
amano
M
e
rge branch 'jn/gitweb-dependency' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'jc/maint-branch-m
e
rge
o
ptio
n
s' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Haman
o
Merge branch 'jc/m
a
i
nt-add-p-o
v
erla
p
pi
n
g-hunks'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
U
pdate
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/
f
ormat-patch-
q
uiet'
into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-15
Junio
C H
a
mano
Merge bra
n
ch '
j
m/mergetoo
l
-
s
ubmodules'
into main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hama
n
o
Merg
e
bran
c
h 'jk/format-p
a
tch-quot
e
-special-in-f
r
om
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge br
a
nch 'vh/git
-
s
vn-
d
oc'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ha
m
ano
g
i
t_open_noati
m
e
(
): drop unused parameter
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-13
Junio C Haman
o
Prepare
for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'aw/maint-r
e
base-i-p-
n
o-f
f
' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C
Haman
o
M
e
r
ge branch 'js/bla
m
e-parsenam
e
' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Me
r
g
e bran
c
h
'gr/cvsimport-al
t
er
n
ative
-
cvspa
s
s-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge branch 'cj
/
p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
Me
r
ge branch 'jk/merge-one-fil
e
-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io
C
Hamano
Merge branch 'jc/f
i
x-diff-fi
l
es-
u
n
m
erged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C H
a
m
a
n
o
Merge branc
h
'mz/maint-rename-unmerged' into m
a
int
commit
|
commitdiff
|
tree
2011-05-09
J
u
ni
o
C Hamano
t1507: av
o
i
d
"${pa
r
ameter<op>'word'}" inside d
o
uble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Haman
o
t3
7
01: add-p-fi
x
makes the last tes
t
to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C H
a
mano
merge: make branch
.
<nam
e
>
.
m
ergeoptions correctly over
r
ide
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C Hamano
t3701: fix h
e
re documen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ham
a
no
G
i
t
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Mer
g
e branc
h
'jh/dirstat
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Mer
g
e branch 'sp/main
t
-clear-postfields' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Ham
a
n
o
M
erge
b
r
a
nch 'jk/maint-stash
-
oob'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
ge branch 'jk/ma
i
nt-uploa
d
-pack-shallow' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge b
r
anch 'dm/st
a
sh-k-i
-
p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge
b
ranch 'jc
/
pack-obje
c
ts-bi
g
file' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
M
erge branch
'mg
/
reflo
g
-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merg
e
branch 'jk
/
stash-l
o
osen-safe
t
y
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge branch 'ar/clea
n
-rmdir-empty' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merg
e
b
ranc
h
'mg/sha1-path-advise' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hama
n
o
"add -p": work-around
an ol
d
laziness that doe
s
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C
Hamano
add--interactive
.
perl: factor out
r
e
peated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Hamano
t
3701: Editing a split hunk in an "a
d
d -p" sessi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
mano
ad
d
-p:
'q' should real
l
y
q
u
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C H
a
mano
Start 1
.
7
.
5
.
1
m
aintenance t
r
ac
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch '
m
g/x
-
y
ears-12-
m
onths' into maint
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o C Hamano
ht
t
p
:
clear POSTFIELDS w
h
en initiali
z
ing a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
Fix "
a
dd -u" that s
o
metimes fails to re
s
olve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-
f
iles: sho
w
unmerged entrie
s
co
r
r
e
ctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
diff:
remove often unused parameters f
r
o
m
diff_u
n
merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
dif
f
.
c
: r
e
turn filepair f
r
om diff_unmerg
e
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
test:
u
s
e
$_z40
from
t
est-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
5
-
rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sy
n
c wi
t
h 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Rev
e
r
t
"
run-command: prettify -D
_
FORTIFY_SOURC
E
wo
r
k
a
round"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io
C
Ha
m
a
no
Git 1
.
7
.
5
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C
Ha
m
ano
M
erge bra
n
c
h
'jc/rev-
l
ist-options
-
f
i
x' into maint
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C
Ham
a
no
Merge bra
n
ch 'js/ch
e
c
k
ou
t
-u
n
tracke
d
-symlink' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-04-12
Junio C Ham
a
no
Mer
g
e
b
ranch 'js/checkout-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Juni
o
C Hamano
M
erge branch 'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-11
Ju
n
i
o
C Hama
n
o
Merge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Juni
o
C Hamano
Me
r
ge g
i
t://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git 1
.
7
.
5-rc
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Sync w
i
th 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Hamano
G
i
t
1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
Merge b
r
a
nch 'nm/maint-conflicted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Merge branch 'mg/rev-list-n-reverse-doc
'
into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Haman
o
Merge branch 'jk/
m
aint-r
e
mote
-
mirror-
s
a
fe
r
'
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Hamano
M
e
rge b
r
anch 'm
g
/doc-revisio
n
s-txt
'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
a
n
o
T
each core
.
bi
g
file
t
hreashold to
pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Hamano
M
erge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
i
o C Hamano
Merge branch 'j
l
/s
u
bmod
u
le-fetch-
o
n-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'jc/rev-list
-
o
ptions-fix'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'nm
/
maint-conflicted-subm
o
d
u
le-
e
ntries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
m
an
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio
C
Hamano
Start preparing for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C
Ha
m
ano
Merge br
a
nch
'
j
c
/i
n
dex-update-if-able' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Ham
a
n
o
Merge
b
ran
c
h '
l
t/de
f
aul
t
-abbrev
'
into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
a
mano
M
erg
e
branch 'jc/maint-rev-list-cu
l
led-b
o
un
d
a
r
y'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio
C H
a
m
ano
M
erge bran
c
h 'mm/maint-lo
g
-n-w
i
th-diff-f
i
ltering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Hama
n
o
Merge br
a
nch 'jk/form
a
t-patch
-
multil
i
n
e-header' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio
C Hamano
M
e
rge branch 'jn/maint-instaweb-
p
lack-fix
'
into maint
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C
Ha
m
a
n
o
Merge branch
'
lp/config-ve
r
name-
c
heck' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-03
J
unio
C
Hama
n
o
Updat
e
relea
s
e notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
u
n
io C Hama
n
o
S
y
nc wit
h
1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
no
Git 1
.
7
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Doc: mention --delta-base-offset is the defau
l
t
for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-02
Juni
o
C Hamano
M
e
rge branch 'nd/in
i
t-git
d
ir'
commit
|
commitdiff
|
tree
2011-04-02
J
u
nio C Hamano
Merge branch '
j
c
/
me
r
ge-sans-bra
n
ch'
commit
|
commitdiff
|
tree
2011-04-02
J
u
ni
o
C Hamano
Merge branch 'jr/grep-en-config'
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o
C
Hamano
Merge
bran
c
h
'ab/i1
8
n-st'
commit
|
commitdiff
|
tree
2011-04-02
Junio
C
Haman
o
Merge
branch '
j
k/
p
ull-into-
e
mpty'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Haman
o
M
e
rge branch 'sb/
s
pa
r
se-mor
e
'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Hamano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge branc
h
'
n
d
/
index-d
o
c
'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-04-01
Junio C Ham
a
no
Merge branch
'pk/
s
tash-apply-
s
tatus-re
l
ative'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio
C Ha
m
an
o
Merge bra
n
c
h
'jc/main
t
-di
f
f-q-filter
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-04-01
Jun
i
o
C H
a
mano
Merge branch 'js/maint-s
t
a
s
h
-ind
e
x-copy' into maint
commit
|
commitdiff
|
tree
next