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 'kk/maint-prefix-in-config-mak' into maint
2011-05-26
Junio C Hamano
Merge bra
n
ch
'
k
k/mai
n
t-pre
f
ix-in-con
f
i
g
-mak' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Haman
o
Merge bra
n
ch 'mg/
d
iff-ui
c
onf
i
g-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
M
erge branch 'ft/g
i
tweb-tar-wi
t
h-gz
i
p-n' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio
C
H
amano
Merg
e
branch 'ss/doc-svn
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
Hamano
M
e
rge
b
r
anc
h
'jn
/
for
m
at
-
p
a
t
ch-do
c
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Mer
g
e branch '
j
c/maint-
p
athspec-
s
tdin-
a
n
d-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge
b
ranch 'j
k
/cherr
y
-pick-root-with-resolve' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'rg/copy-g
e
cos-
u
sername' into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Mer
g
e branch 'fc/com
p
l
e
t
i
o
n
-zsh
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/git-connection-deadlock-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hama
n
o
Merge branch 'js/maint-send-pack-statel
e
ss-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge
bra
n
c
h
'
s
vn-f
e
-maint'
o
f
g
i
t
://repo
.
or
.
cz/git
.
.
.
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-17
Juni
o
C Hamano
Mer
g
e branch 'js/maint-1
.
6
.
6-s
e
nd-pack-
s
t
a
t
eless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
U
p
d
at
e
draft rele
a
se notes 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
/
maint-fo
r
m
a
t-p
a
t
ch-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C
H
amano
Merge bra
n
ch
'
ss/cherry
-
p
ick-
x
-doc'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch 'vr/merg
e
-
base-doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
ano
M
e
rge br
a
nch 'sr/maint-f
a
s
t-impor
t
-t
i
ghten-option
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge branch 'jc/t1506-shell-par
a
m-expansion-g
o
tcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
a
no
Merge branch 'jc/fix-
a
d
d
-u-unme
r
g
e
d
'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Ha
m
ano
Merge branch 'jn/gitweb-dependency' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch 'jc/maint-branch-mergeopti
o
ns
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge
b
r
a
nch 'jc/maint-
a
dd-p-ov
e
rl
a
p
p
ing-h
u
n
ks'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
an
o
sideb
a
nd
_
demux():
f
ix decl-af
t
er-
s
tmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Update dr
a
ft
rel
e
a
se notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
a
n
o
Merge br
a
n
c
h
'
cn/for
m
at-
p
atch-quiet' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'j
m
/
m
ergetool-submod
u
l
e
s' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge b
r
anch '
j
k/format-patch-
q
uote-special-in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Merge
b
ran
c
h 'vh/git-svn-do
c
' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hama
n
o
git_open_noa
t
i
m
e
(
)
: drop
u
n
u
sed parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
sha1_f
i
le: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
unio 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 Ham
a
no
Merge bran
c
h 'aw/
m
a
int-rebase-i-p-no-ff'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'js/blame-pa
r
sename' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ha
m
ano
M
erge
bran
c
h
'
gr/cvsimpo
r
t-alternative-cvspass-lo
c
ation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Me
r
ge bra
n
ch 'cj/p4merge' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C H
a
mano
Merge branch 'j
k
/
m
erge-one-fi
l
e-
w
orking-
t
ree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C H
a
mano
Merge branch
'
jc/fix-dif
f
-files-unm
e
rge
d
' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
ano
Merge branch 'mz/m
a
int-ren
a
me
-
u
n
mer
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
ano
Merge
b
ranch 'jc/ma
i
nt
-
1
.
7
.
4-pathspec-stdin-an
d
-cmdl
i
ne
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio
C Hamano
Merge branch 'jc/
m
aint-1
.
6
.
6-p
a
t
h
spec-stdin-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
setup_r
e
visi
o
n
s
(): tak
e
pat
h
s
p
ec
f
rom comm
a
nd line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Hamano
Revert "
H
onor $
(
prefix)
s
et
i
n config
.
mak* when
d
efining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Jun
i
o C Hamano
t1507: a
v
oid "$
{
p
arameter<op>'word'}" inside
d
ouble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add-p-fix
m
akes the l
a
st test to
p
as
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
m
e
r
ge: make branch
.
<n
a
me>
.
mergeoptions c
o
rre
c
t
l
y overrid
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge branch 'js/m
a
in
t
-
1
.
6
.
6-send-pack
-
stateles
s
-rp
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C
H
am
a
no
t3701: fix here docume
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
amano
Git
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Merge b
r
anch 'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Me
r
ge br
a
nch
'
sp/maint-cl
e
ar-postfields'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch
'
jk/maint-s
t
ash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge br
a
nch 'jk/maint-upl
o
ad-pac
k
-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C
Hamano
Merge b
r
anch 'dm/stash
-
k-i-p'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
M
erge branc
h
'
j
c/pack-
o
b
je
c
ts-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge b
r
a
n
ch 'mg/reflo
g
-with-options' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
erge branch
'
jk/stash
-
loosen-safet
y
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge b
r
a
n
c
h 'ar/c
l
ean-rmdir-
e
m
p
ty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Ham
a
n
o
Merge branch 'mg
/
sha1-path-advise'
into mai
n
t
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o
C
Hamano
"add -p":
w
ork-a
r
ound a
n
old
laziness
t
hat does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C H
a
m
ano
add--interacti
v
e
.
p
e
r
l: factor out repeated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
t
3
701
:
Editing a split
hun
k
in an
"add -p"
s
ession
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
a
no
add
-
p:
'
q' should really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
St
a
rt
1
.
7
.
5
.
1 maintenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
M
erg
e
b
ra
n
ch 'mg/x-years-12-months' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-04-26
Jun
i
o C Hama
n
o
h
t
tp:
c
lear POSTFIE
L
DS when i
n
itializing
a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Jun
i
o C Haman
o
M
e
rge
b
ranch 'js/maint-1
.
6
.
6-
s
end-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
J
uni
o
C Ha
m
ano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Fix "add
-u" that somet
i
mes fails to resolve unmerg
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
a
m
a
no
diff-files: show u
n
m
e
r
g
e
d
en
t
ries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff:
r
emove ofte
n
unus
e
d
parameters from diff_
u
nmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c: retur
n
filepair
from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C
Hamano
test: use $_
z
4
0 from test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Ham
a
no
G
it 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Juni
o
C Hamano
S
y
nc
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
Ham
a
no
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
u
nio C
Hamano
Revert "run-command: pretti
f
y -D_FORT
I
FY
_
SOURCE
w
orkaro
u
nd"
commit
|
commitdiff
|
tree
2011-04-15
Junio
C Hamano
Merge v
1
.
7
.
5-rc2 into jn/format-pat
c
h-d
o
c
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o
C Hama
n
o
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
H
a
m
ano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
i
o C Ham
a
no
M
e
r
ge b
r
anc
h
'
jc/rev-list-
o
ptions-fi
x
' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
Merge branch 'js/checkout-un
t
racked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-12
J
u
nio C Haman
o
M
erge branch 'js/checkout-
u
ntrack
e
d
-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
M
e
rge branch 'nd/i
n
i
t
-gitdir'
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge git://gi
t
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio
C Hamano
Merge git://git
.
kern
e
l
.
org/
p
u
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git 1
.
7
.
5-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Ha
m
ano
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C Hamano
Git 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C
H
a
mano
Me
r
ge
bra
n
ch 'nm/mai
n
t-c
o
n
flict
e
d-submod
u
le-en
t
rie
s
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Hamano
M
e
rge br
a
nch 'mg/r
e
v-
l
ist-n-r
e
v
erse-doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
Me
r
ge bran
c
h 'jk/maint-
r
emote-mirr
o
r-s
a
fer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge
branch 'mg/do
c
-revi
s
i
ons-txt'
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C H
a
mano
Teach cor
e
.
b
i
gfilethreashold
t
o pack-obje
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'j
l
/submod
u
le-fetch-on
-
demand'
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C Ham
a
no
Merge branch '
j
c/rev-l
i
s
t-optio
n
s
-fix'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'nm/maint-conflicted-submodule-entrie
s
'
commit
|
commitdiff
|
tree
next