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 'rr/doc-content-type' into maint
2011-05-31
Jun
i
o C
H
a
m
a
no
Me
r
ge branch 'rr/doc-cont
e
nt-type' into m
a
int
commit
|
commitdiff
|
tree
2011-05-30
Ju
n
io C
H
amano
Merge branch 'jm/maint-misc-f
i
x' into maint
commit
|
commitdiff
|
tree
2011-05-30
J
u
nio C Hamano
Merge branch
'
bc/maint-sub
m
odule-f
i
x-park
e
d' into maint
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o C Hamano
Merge branch 'bc/maint-api-doc-
p
a
r
ked'
into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-30
Jun
i
o
C Ham
a
no
Merge
b
ranch
'
jn/run-com
m
a
nd-error-f
a
i
l
ure' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
J
u
n
io C
H
amano
G
i
t
1
.
7
.
5
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-26
J
un
i
o C Hamano
Merge branch 'maint
-
1
.
7
.
4' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
no
Merge branch '
j
k
/git-co
n
nection
-
deadl
o
ck-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge bran
c
h
'
j
s
/m
a
int-send-pack-stateless-rp
c
-
d
e
ad
l
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Me
r
ge br
a
nc
h
'j
k
/mai
n
t
-upload-pack-s
h
allow' int
o
main
t
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'jm/
m
aint-diff-w
o
rd
s
-
w
i
th-sbe'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge
branch
'kk/maint-prefix-in-config-mak
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
a
mano
Merge
b
ranch 'mg/diff-u
i
c
onfig-doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge bran
c
h
'ft/gitweb-tar-wi
t
h-
g
z
i
p-n
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
J
unio C Hamano
Merge
b
r
anch 'ss/doc-svn'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
ni
o
C
Hamano
M
e
rge b
r
an
c
h
'
jn/
f
ormat-
p
atch
-
doc' into
maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Ha
m
ano
Merg
e
branch 'jc/maint-pathsp
e
c-
s
tdin-and-cm
d
line'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
man
o
M
erge bran
c
h
'jk/cherry-pick-root-with-
r
e
solve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
erge branch
'r
g
/copy-g
e
cos-usern
a
me' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'fc/complet
i
on-zsh' into
m
aint
commit
|
commitdiff
|
tree
2011-05-26
Junio C
H
aman
o
Merge branch 'jk/git-conn
e
ction-deadlock-fix' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Juni
o
C Hamano
Merge
b
ranch 'j
s
/maint-send-pack-st
a
teless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge bra
n
ch 'svn-fe-main
t
' of git://repo
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Ham
a
no
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Jun
i
o C Haman
o
Merge b
r
an
c
h 'j
s
/ma
i
n
t-1
.
6
.
6-
s
e
n
d-pack-s
t
a
te
l
e
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Upd
a
te draft re
l
e
ase
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 bran
c
h 'jn/maint-form
a
t-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'ss/cherr
y
-pick-x-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
n
o
M
erge
branch 'vr/merg
e
-b
a
se-doc' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
amano
Merge
b
ranch 'sr/main
t
-fast-import-ti
g
h
ten-option-pars
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch
'j
c
/t1506-shell-p
a
ram-exp
a
nsion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hama
n
o
Merge branch 'jc/fix-add-u
-
unmerged' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hama
n
o
M
er
g
e
b
ran
c
h
'jn/
g
itweb-dependency' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
H
amano
M
e
r
g
e
branch 'jc
/
maint
-
branch
-
merg
e
opt
i
o
ns
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C
Hamano
M
erge
b
ran
c
h 'jc/maint
-
ad
d
-p
-
ove
r
lap
p
in
g
-hun
k
s' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sid
e
band_demu
x
(): fi
x
decl-
a
f
t
er-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Update
d
r
aft
release notes
t
o 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hama
n
o
Merg
e
branch 'cn/format-patch-
q
u
i
et' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
M
e
rge
branch 'jm/mergetool-
s
u
bmo
d
u
les' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
b
ran
c
h 'jk/format-patc
h
-
q
uote-special-in-f
r
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
M
erg
e
branch '
v
h/git-
s
vn-
d
o
c
' into maint
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
git_open_noatime(): drop unused pa
r
a
m
eter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
sha
1
_f
i
l
e: typo
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
P
r
e
pare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge bran
c
h
'
aw/m
a
int-re
b
ase-i-p-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Hamano
Merge branch 'js/blame-p
a
rsename' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge b
r
a
n
ch 'gr/cvsim
p
ort-
a
lternative-
c
vspass-loc
a
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
a
m
a
no
Me
r
ge
b
ranch 'cj
/
p4merge' i
n
to m
a
in
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'j
k
/merge-one-file-working-tree'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
a
n
o
Merg
e
br
a
nch '
j
c/fix-diff-files-unmerged' i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
ma
n
o
Mer
g
e branch 'mz
/
maint-rename
-
unme
r
ged' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Ham
a
n
o
Merge branch 'jc/mai
n
t-1
.
7
.
4-paths
p
e
c
-s
t
din-and-cmdli
n
e'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merge
branch 'jc/maint
-
1
.
6
.
6-pathspec-stdin-an
d
-cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
s
etup_revis
i
ons()
:
take p
a
thspec fr
o
m co
m
m
a
nd li
n
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
ni
o
C
Ha
m
a
n
o
Reve
r
t
"Honor
$(prefi
x
) set i
n
c
on
f
ig
.
mak* w
h
e
n defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C Ham
a
no
t1507: avoi
d
"${paramet
e
r
<op>'word
'
}"
i
n
s
i
d
e doub
l
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C
Hamano
t
37
0
1:
a
dd-p
-
f
ix
m
akes the last test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hama
n
o
merge: make branch
.
<n
a
me>
.
mergeoptions correctly overri
d
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
Merge br
a
nc
h
'js/
m
a
int-1
.
6
.
6-send
-
pack
-
stateles
s
-
r
pc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix
here doc
u
ment
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
Junio
C Hamano
Merge branch 'jh/dirst
a
t' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e branch 'sp/maint-c
l
ear-postfields' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge branch 'jk/maint
-
stash-o
o
b'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hama
n
o
Me
r
ge branch
'
j
k/main
t
-
upload
-
p
ack-sh
a
ll
o
w' in
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branc
h
'dm/stash-k-i-p' into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
ma
n
o
Merge branch '
j
c/pack-objects
-
bigfile' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'mg/reflog-with-opti
o
ns' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Hamano
Me
r
ge bran
c
h
'jk/stash
-
loo
s
en-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge br
a
nch
'
a
r/clean-rmdir-empty
'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge
b
ranch 'mg/sha1-path-a
d
vise'
into maint
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
mano
"add -p
"
: work-around
a
n old la
z
iness that
d
oes not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hamano
add--
i
n
terac
t
ive
.
perl: factor out repeated --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: Ed
i
ting a
split hunk in an "add -p"
s
ession
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -p: 'q'
s
hould r
e
ally quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C H
a
m
a
no
St
a
rt 1
.
7
.
5
.
1 maintenance t
r
ack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
unio C Hamano
Merge branch 'mg/x-
y
ears-12-
m
onths' into maint
commit
|
commitdiff
|
tree
2011-04-26
J
unio C Ham
a
n
o
h
ttp: cl
e
ar POST
F
IELDS when
initi
a
l
izin
g
a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Junio C H
a
mano
Merge b
r
anch
'
js/maint-1
.
6
.
6
-send-pack-stat
e
less-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Git
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
Fix "add -u" that
s
ometimes fails
t
o resolve unmerg
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
diff-files: show u
n
merged entri
e
s correc
t
l
y
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 un
u
sed parameters
f
rom dif
f
_
u
n
m
erge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C H
a
mano
diff
.
c:
return fil
e
pai
r
from
diff_unmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o 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 Haman
o
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio
C Ha
m
ano
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 Hamano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C
Ha
m
a
no
Reve
r
t
"run-
c
ommand
:
prettify -
D
_
FORTIFY_SOURCE wo
r
karound"
commit
|
commitdiff
|
tree
2011-04-15
Jun
i
o C Hamano
M
e
r
ge v1
.
7
.
5
-rc2 into jn/format-patch-doc
commit
|
commitdiff
|
tree
2011-04-14
Junio
C Hamano
Merge branch '
m
a
in
t
'
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
Git
1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merg
e
branc
h
'
j
c/rev-list-opti
o
ns-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
erge
b
ran
c
h 'js/checko
u
t-untracked-symlink' int
o
maint
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge bra
n
ch 'j
s
/chec
k
out-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
J
unio
C
Ham
a
n
o
Merg
e
branch 'nd/init-gitdi
r
'
commit
|
commitdiff
|
tree
2011-04-11
Junio C H
a
mano
Merg
e
git://git
.
bogom
i
ps
.
o
rg
/
git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C H
a
mano
Merge git:
/
/g
i
t
.
kern
e
l
.
org
/
pub/scm/
g
i
t
k/gi
t
k
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C
H
a
mano
Git
1
.
7
.
5-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next