repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'vr/merge-base-doc' into maint
2011-05-16
Junio C Hamano
Merge br
a
nch 'vr/merge-
b
ase-doc
'
into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
M
erge bran
c
h 'sr/maint-fast-impo
r
t-tighten-option-parsi
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
am
a
no
Merge
b
r
an
c
h
'jc/t15
0
6-shell-param-exp
a
nsion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch
'
jc/
f
i
x
-add-u-unmerged' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'
j
n/gitweb-depende
n
cy'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merge branch 'j
c
/maint-branch-mergeoptions'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Merge
branch 'jc
/
m
a
int-add-p-overlappin
g
-
h
u
nks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
Haman
o
Update draft release no
t
es to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge
b
ran
c
h 'cn/format-patch-quiet' into main
t
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hama
n
o
Merge branch 'jm/mergetool-submod
u
les'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'jk/format-pa
t
ch-quote
-
speci
a
l-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
un
i
o C H
a
m
a
no
Merge br
a
nch 'vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
amano
git_open_noatime(): dr
o
p unuse
d
paramete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
Hamano
sha1_fil
e
:
typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
u
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
Junio C Hamano
Merge branch 'aw/main
t
-reba
s
e
-
i
-p-no-ff' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'js/blame-parsename' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge branch 'gr/cvsim
p
ort-alternativ
e
-c
v
s
p
ass-locati
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
Mer
g
e branc
h
'c
j
/p4merg
e
' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
Merge
b
ra
n
ch 'jk/merg
e
-
o
n
e-file
-
w
orking
-
tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
man
o
Merge branch 'jc/fix-d
i
ff-files-unmerged' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merg
e
branch 'mz/maint-re
n
ame-unmerged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1507: avoid "$
{
para
m
ete
r
<
op>'
w
ord'}"
i
nside double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t
3
701: ad
d
-p-fix makes t
h
e last
test t
o
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
m
erge
:
m
ake branch
.
<name>
.
merg
e
o
pt
i
o
n
s correct
l
y o
v
erride
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t37
0
1: fix
he
r
e docu
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merg
e
branch 'jh/
d
i
r
s
tat'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Me
r
ge bra
n
ch 'sp/maint-clear-postfield
s
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ha
m
a
no
Merge
b
ranch 'jk/maint-stash-oob' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io
C
H
a
m
ano
Merg
e
b
r
anch
'
jk/maint-upl
o
ad-pack-shall
o
w' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branc
h
'dm/stash-k-i-p' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge branch 'jc/pack-o
b
jects-bigfile' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge
branch 'mg/r
e
flog-w
i
th-options
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C
Ham
a
no
Mer
g
e branch '
j
k/stash-loosen
-
safety' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
e
rge branch
'ar/clean-rmdir-empty' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C
Hamano
Merge branch
'
m
g/sha1
-
path
-
ad
v
is
e
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C
H
a
m
ano
"add -p": work-around a
n
old laziness that does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
add--in
t
eractiv
e
.
perl: factor out repeated --recoun
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
mano
t3701:
E
diting a
s
plit
h
u
n
k
i
n
a
n "add -p"
session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
ama
n
o
add -p:
'
q' should really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
Start 1
.
7
.
5
.
1 maintenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io
C Hamano
M
e
rg
e
b
ranch 'mg/x-yea
r
s-12-m
o
nths' int
o
maint
commit
|
commitdiff
|
tree
2011-04-26
Junio C
H
amano
h
t
t
p
: clear P
O
STF
I
ELDS when initializi
n
g
a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
mano
Fix
"ad
d
-u" th
a
t sometimes fails
t
o r
e
solve un
m
er
g
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
di
f
f-files: sh
o
w unmerg
e
d en
t
ries correct
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
di
f
f: r
e
m
ove
o
f
t
en u
n
used
param
e
t
e
rs from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
diff
.
c: return filepair fr
o
m
diff_unmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
test: use $_z40 from test-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
J
u
nio C H
a
mano
Sync with
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o
C
Haman
o
G
i
t 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Revert "run-co
m
mand: p
r
ettify -D_FORTIFY_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-14
J
unio C
H
amano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Haman
o
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
Merge
branch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Haman
o
M
erg
e
bra
n
ch 'jc/r
e
v
-list-opti
o
ns
-
fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
Merg
e
bra
n
ch 'js/check
o
ut-untracked-symlink'
into maint
commit
|
commitdiff
|
tree
2011-04-12
Junio C Ha
m
a
no
Merge
b
ranch 'js/c
h
eckout-untracked-sy
m
l
i
nk'
commit
|
commitdiff
|
tree
2011-04-12
Junio C
Hamano
M
e
rge bra
n
ch '
n
d/init
-
gi
t
dir'
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge
git://git
.
bogom
i
ps
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
Hama
n
o
Merge gi
t
:
/
/
git
.
ke
r
nel
.
org/pub/scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
i
o
C
Hamano
Git 1
.
7
.
5-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
unio
C
Hamano
Sync
w
ith 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
i
o C Hama
n
o
Git 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hama
n
o
Merge
branch
'
nm/maint-con
f
li
c
ted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Me
r
ge branch 'mg/rev-li
s
t-n-r
e
verse-doc' into
ma
i
nt
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch 'jk/maint-remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merg
e
branc
h
'mg/doc-revisions-tx
t
'
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
ama
n
o
Teach cor
e
.
b
igfilethreashold
to pack
-
objec
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Ham
a
no
Merge
b
r
a
nch 'jl
/
submodule-fetch
-
on-demand'
commit
|
commitdiff
|
tree
2011-04-04
J
unio C
H
a
mano
Merge bran
c
h
'
j
c/rev-li
s
t-options-f
i
x'
commit
|
commitdiff
|
tree
2011-04-04
J
un
i
o C Hamano
M
erg
e
branch 'nm/maint-conflicted-sub
m
odule-entr
i
es'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
S
tart preparing
f
or
1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C H
a
mano
Merg
e
branch 'j
c
/ind
e
x
-
u
pdate-if-able' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-04-03
J
un
i
o
C
Hamano
Merge branc
h
'lt/
d
e
f
a
ult-
a
bbre
v
'
i
n
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
an
o
Merge branch 'j
c
/maint-rev
-
li
s
t
-
cu
l
led-boun
d
ar
y
' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
amano
Me
r
g
e branch 'mm/main
t
-log-n-with-diff-fi
l
t
ering' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge
b
ranch 'jk/for
m
at-patch-mul
t
i
line-he
a
der' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
erge branch
'
jn/maint-
i
nst
a
web
-
plack-fix' into m
a
int
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o
C Hamano
Mer
g
e branch 'lp/config
-
vernam
e
-check' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
U
p
date relea
s
e notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Hama
n
o
Sync wit
h
1
.
7
.
4
.
3
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
amano
Git
1
.
7
.
4
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Haman
o
Doc
:
mention --delta-base-offset is the d
e
fault for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-02
Jun
i
o
C
Hama
n
o
Me
r
ge bra
n
ch 'nd/init-gitdir
'
commit
|
commitdiff
|
tree
2011-04-02
Ju
n
io
C
H
amano
Me
r
ge
b
ran
c
h 'jc/
m
e
r
ge-s
a
ns-
b
ranch'
commit
|
commitdiff
|
tree
2011-04-02
Junio
C
H
amano
Merge b
r
anch
'
jr/grep-e
n
-
c
o
nfig'
commit
|
commitdiff
|
tree
2011-04-02
Ju
n
i
o C Ham
a
n
o
Merge br
a
nch 'ab/i18n-
s
t'
commit
|
commitdiff
|
tree
2011-04-02
J
unio C
H
amano
Merg
e
b
ra
n
ch 'jk
/
p
ull
-
into-empt
y
'
commit
|
commitdiff
|
tree
2011-04-02
Junio C Haman
o
Mer
g
e b
r
anch '
s
b/sparse
-
more'
commit
|
commitdiff
|
tree
2011-04-02
Junio C
Hamano
Me
r
ge br
a
nc
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2011-04-01
Juni
o
C Ham
a
n
o
Mer
g
e
b
ranc
h
'nd/index
-
doc' in
t
o
m
a
i
nt
commit
|
commitdiff
|
tree
2011-04-01
Junio C H
a
m
a
n
o
Mer
g
e
branch
'
pk
/
st
a
sh-a
p
pl
y
-status-
r
e
l
ative' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-01
Junio C Hamano
Merge br
a
nch
'
jc/maint-diff-q-f
i
lter' into main
t
commit
|
commitdiff
|
tree
2011-04-01
J
unio C Hamano
Merge b
r
anch
'j
s
/
m
a
int-
s
tash-index-copy' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-01
Juni
o
C
Hamano
Merge branch 'mg/doc
-
bi
s
ect-
t
weak-worktre
e
' into mai
n
t
commit
|
commitdiff
|
tree
next