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 'maint-1.7.4' into maint
2011-05-26
Junio
C
Hamano
Merge
b
ranch 'maint-1
.
7
.
4' into main
t
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jk/git-co
n
nection-deadlo
c
k
-f
i
x' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o
C H
a
ma
n
o
Merge bran
c
h 'js/mai
n
t
-
s
e
n
d
-pa
c
k-sta
t
eless-r
p
c-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merg
e
bra
n
c
h 'jk/maint-upload-pack-shal
l
o
w' i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
er
g
e branch '
j
m/maint-di
f
f-words-with-sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio
C H
a
mano
Merge
b
ranch
'
kk/
m
a
i
nt-pr
e
fix-in-config-ma
k
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Ham
a
n
o
Mer
g
e branc
h
'mg/
d
iff-uiconfig-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
r
ge branch 'ft/g
i
tw
e
b-tar-with
-
gz
i
p-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
i
o
C Ham
a
no
Merge branch 'ss/
d
o
c
-
svn' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jn
/
format-patch
-
doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bra
n
c
h 'jc/maint-p
a
thspec-stdin-and-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
Hama
n
o
M
e
rge branc
h
'jk/cherr
y
-
p
i
ck
-
root-wit
h
-resolve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge br
a
nch 'rg
/
copy-gecos-username'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C
Hamano
Me
r
ge bran
c
h 'fc/com
p
letion-zsh' in
t
o
main
t
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio
C
Hamano
M
erge branch 'jk/
g
it-
c
o
n
nection-dead
l
oc
k
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
i
o C Hamano
Merge
branch 'js/maint-send-p
a
ck
-
stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio
C Hamano
Merge bra
n
c
h
's
v
n-fe-maint
'
of g
i
t://re
p
o
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
J
unio C
H
amano
Git
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hama
n
o
M
erge
b
r
anch
'
js/ma
i
nt-1
.
6
.
6-send
-
p
ack
-
state
l
ess-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Updat
e
dr
a
ft
r
elea
s
e not
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 br
a
nch '
j
n/
m
aint-format-pa
t
ch-doc' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
M
e
rge branch '
s
s/ch
e
rry-pick-x-
d
oc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
m
ano
Merge branch 'vr/merge-ba
s
e-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C Hamano
Merge
b
ra
n
ch 'sr
/
maint
-
fast-imp
o
r
t
-ti
g
hte
n
-option-
p
arsi
n
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Me
r
g
e branch 'jc/t150
6
-she
l
l-param-exp
a
ns
i
o
n
-g
o
tcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C
Hamano
Mer
g
e branch 'jc/fix-
a
dd
-
u-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
M
e
rge branch 'jn/gitweb-de
p
endency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Hama
n
o
Merge branch 'jc/maint-bran
c
h
-
mergeopt
i
ons'
in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
amano
Merge b
r
anch
'
jc/ma
i
nt-add-p-overlapping
-
hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
Haman
o
sideband_de
m
ux(): fi
x
de
c
l-after
-
stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
Hamano
Update dra
f
t rele
a
se notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Merg
e
b
r
anch 'cn/format-pa
t
ch
-
quiet
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C Hamano
M
erge b
r
anch 'jm/mergetool-
s
ubmodules'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
M
e
rge branch 'jk
/
format-patch
-
q
uote-speci
a
l-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'vh/git
-
svn-doc' into
m
a
in
t
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Ham
a
no
git
_
open_
n
oatim
e
():
d
rop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
a
n
o
sha1
_
file: typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
unio
C Ha
m
a
no
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 branch 'aw/ma
i
nt-rebase-i-p-no-
f
f' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Hamano
Merge branc
h
'js/bla
m
e-
p
arsename' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
M
e
rg
e
bran
c
h 'gr
/
cvsimport-alternative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
M
e
rge br
a
nch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'jk/merge-
o
ne
-
file-
w
orki
n
g-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
Hamano
M
erg
e
branch '
j
c/fi
x
-diff-file
s
-un
m
e
r
ged' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'mz/maint-
r
enam
e
-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
branch 'jc/maint-1
.
7
.
4
-pathspec-stdin-a
n
d-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-1
.
6
.
6
-
pathsp
e
c-
s
tdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
setup_revisions
(
):
t
a
k
e pathspec from
c
ommand l
i
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
unio C
Ha
m
ano
Revert "Ho
n
or $
(
pre
f
i
x) set in config
.
mak*
w
hen defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
J
unio C
H
amano
t1507: avoid "${
p
arameter<op>'word
'
}" insi
d
e double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
u
n
i
o
C Hamano
t3701
:
add-p-fix mak
e
s the last te
s
t to pas
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
mer
g
e:
make bra
n
ch
.
<
name>
.
mer
g
eoptions
c
orrectly overri
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C Ham
a
n
o
Merge bra
n
c
h 'js/m
a
i
n
t-1
.
6
.
6-sen
d
-pa
c
k
-
stateless
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hama
n
o
t3701: fix
h
ere document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Gi
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
Merg
e
branch 'jh/dirs
t
at'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge bra
n
ch 'sp/
m
ai
n
t-clear
-
p
o
stfields' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
a
mano
M
e
rge branch '
j
k/maint-stash-oob
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Haman
o
Merge branch 'jk/maint-upload-pack-
s
hallo
w
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
H
amano
M
e
r
ge bran
c
h 'd
m
/stash-k-i-p'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
mano
M
erge branch '
j
c/pack-objec
t
s-bi
g
file' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'
mg/reflog-with-o
p
tions' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge branch 'jk/stash-loos
e
n-safety' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge
b
ran
c
h 'ar/clean-rmdir-emp
t
y
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C
H
amano
Merg
e
branch 'm
g
/
s
ha1-path-advise' into m
a
in
t
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
"add
-p": wo
r
k
-ar
o
und an old laziness that does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
am
a
no
add--intera
c
tive
.
p
erl: factor o
u
t
r
epeated --rec
o
u
nt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t
370
1
: Editi
n
g a split hun
k
in an "a
d
d
-p" session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
io C Hamano
add -p
:
'q' sh
o
uld r
e
ally quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
n
o
Start 1
.
7
.
5
.
1 m
a
intenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
M
erge b
r
anch 'm
g
/x-years-12-mont
h
s
'
int
o
m
aint
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
Ha
m
a
no
h
t
tp: c
l
ear P
O
STFIELDS when
i
niti
a
lizing
a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
J
u
ni
o
C Hamano
Merge branch 'js/main
t
-1
.
6
.
6-send-pack-stat
e
less-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
J
uni
o
C Haman
o
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Hamano
Fix "a
d
d -
u
" t
h
at somet
i
me
s
fails t
o
r
esolve
u
n
m
e
rged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
diff-files:
show unmerged
en
t
ries c
o
rre
c
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
diff: r
e
move
often u
n
us
e
d parameters from di
f
f
_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
d
i
ff
.
c: r
e
turn
filepair from
d
iff
_
unme
r
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: use $_z40 from
tes
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
mano
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
t
h 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C
H
amano
R
eve
r
t "
r
un-command: prettify -
D
_
FORTIFY_S
O
URCE
w
orkaround"
commit
|
commitdiff
|
tree
2011-04-15
Junio C
H
aman
o
Me
r
ge v
1
.
7
.
5-rc2 into jn/format-patch-doc
commit
|
commitdiff
|
tree
2011-04-14
Junio C
Hamano
Merge
b
ran
c
h
'
maint'
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C Hama
n
o
Git
1
.
7
.
5-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge
b
ran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C Hamano
Merge bran
c
h 'jc/
r
ev-lis
t
-options-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
io
C H
a
mano
Merge branch 'js/c
h
eckout-unt
r
acked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-12
Junio C
H
amano
Mer
g
e branch 'j
s
/chec
k
out-untracked-s
y
ml
i
nk'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hama
n
o
Merge branc
h
'
nd/in
i
t-gitdir
'
commit
|
commitdiff
|
tree
2011-04-11
J
u
n
i
o
C Ham
a
no
Merge g
i
t://git
.
bog
o
mip
s
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Ham
a
n
o
M
erge g
i
t:/
/
git
.
kernel
.
org/pub/scm/gitk
/
g
it
k
commit
|
commitdiff
|
tree
2011-04-06
Junio C Haman
o
Git 1
.
7
.
5
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C Haman
o
Gi
t
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Hamano
Merge b
r
an
c
h 'nm/ma
i
n
t
-c
o
n
f
l
i
cted
-
s
ubmodule-en
t
ries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
Merg
e
branc
h
'mg/rev-lis
t
-n-reve
r
se
-
do
c
' into
mai
n
t
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Ha
m
a
n
o
Merge bra
n
ch
'jk/
m
aint-remote-mirror-sa
f
er
'
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C Ham
a
no
Merge br
a
nc
h
'
m
g/doc
-
revisions-txt'
commit
|
commitdiff
|
tree
next