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 Ha
m
a
no
Merge branch 'maint-1
.
7
.
4
'
into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merg
e
branch 'jk/git-c
o
nnecti
o
n-de
a
dlo
c
k-
f
i
x
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio
C Hamano
M
e
rge
b
ranch 'js/
m
a
i
nt-send-p
a
c
k-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
M
e
rge branch 'jk/mai
n
t-uplo
a
d
-
pack-shallow'
into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
man
o
Merge bra
n
ch 'jm/maint-diff-words-with-sbe' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge bran
c
h '
k
k
/
main
t
-pre
f
ix
-
in-config-m
a
k' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge
b
ranc
h
'mg/diff-uiconfig-doc'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch '
f
t/gitweb-ta
r
-wi
t
h-gzip-n' into maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ham
a
n
o
Merge branch
'
ss/doc-s
v
n' int
o
maint
commit
|
commitdiff
|
tree
2011-05-26
Junio C Ha
m
ano
Merge branc
h
'jn/format-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Ham
a
n
o
Merge b
r
anc
h
'jc/maint-pathspec-stdin
-
a
nd-cmdline'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'j
k
/c
h
erry-pic
k
-root-with-resolve' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C
H
amano
Merge branch 'rg/copy-geco
s
-username' i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'fc/c
o
m
p
letion-zs
h
' into maint
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C
Haman
o
Merge branch 'jk/
g
i
t-con
n
ec
t
i
o
n-de
a
d
l
ock-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io C Hamano
Merge branch 'js/ma
i
nt-
s
end-pack-stateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
J
unio C H
a
mano
Merge
b
r
anch 'sv
n
-fe-main
t
'
of git://r
e
po
.
o
r
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C
Hamano
Merge branch 'js/maint-1
.
6
.
6-send-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
uni
o
C Hamano
Update draft
r
e
l
ease notes to 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
am
a
no
Merge bra
n
ch 'jn/m
a
int-format-patch-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
Mer
g
e
branch 'ss/cherry-pic
k
-
x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
M
e
rge branch
'vr/me
r
ge-base-doc'
into
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
e
r
g
e bra
n
ch
'sr/maint
-
fa
s
t-import-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Me
r
ge branch '
j
c/t150
6
-shell-param-
e
xpansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bra
n
ch 'jc/fix-ad
d
-u-un
m
er
g
ed' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
a
no
Mer
g
e bran
c
h 'jn/gitweb-depe
n
dency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
branch
'jc/maint-branc
h
-mergeo
p
tions'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge branch 'jc
/
maint-add-
p
-overlapping-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
sideband_demux
(
): fix decl-afte
r
-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C Hamano
U
pdate draft release notes
t
o
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Ham
a
no
Merge branch 'cn
/
format-patch-quiet' into
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Merge branc
h
'j
m
/mergetool-s
u
bmodules' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
bran
c
h 'jk/format-patch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch '
v
h/g
i
t-svn
-
doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
g
it_open
_
noatime(): drop unuse
d
paramet
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
sha1_file: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Prepare for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
Hamano
Merge branch 'aw/maint-rebase-i
-
p-no-ff' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merg
e
b
r
anch 'j
s
/blame-parsen
a
me' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge
b
ranc
h
'
gr/cvsimport-alte
r
nati
v
e-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Me
r
g
e b
r
anch 'cj/p4
m
erge' i
n
to
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge bra
n
ch 'jk/
m
erge-one
-
file-w
o
rk
i
n
g
-
tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ham
a
n
o
Merge branch 'jc/fix-d
i
ff-files-unmerged
'
i
n
to
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge b
r
anch 'mz/maint-
r
ena
m
e-u
n
merge
d
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
Merge b
r
anch 'jc/maint-1
.
7
.
4
-
pathspec-stdin-a
n
d-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Merge bran
c
h
'jc/ma
i
nt-1
.
6
.
6-pa
t
hsp
e
c-stdi
n
-and
-
cmd
l
ine'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setup_revisi
o
ns(): take pathspec
f
rom comm
a
nd line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Hamano
Revert "H
o
nor $(prefi
x
) set in
c
onf
i
g
.
ma
k
* when
d
e
f
ining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1507:
avoid "${parame
t
er<
o
p>'word'}
"
inside
d
o
u
ble
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add-p
-
f
ix makes th
e
last test to pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Hamano
merg
e
: mak
e
bran
c
h
.
<n
a
me>
.
mergeoptions correctly ov
e
r
r
i
d
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C Hamano
Merg
e
b
r
anch 'js/maint-1
.
6
.
6-s
e
nd-pack-stateless
-
rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fi
x
her
e
docu
m
e
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C H
a
m
a
n
o
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch
'jh/dirs
t
at' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge branch 'sp/maint-cle
a
r-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hama
n
o
Merge branch 'jk/maint-stash
-
oob
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'
jk/maint
-
upload-pack-shallow' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
Hamano
Merge branch
'
dm/stash-k-
i
-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge branch
'jc/pack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ha
m
ano
M
erge branch 'm
g
/reflog-w
i
th-option
s
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Me
r
ge branch
'jk/stash-loos
e
n
-safety'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
am
a
no
Merge branch 'ar/clean-rmdir-empty' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
amano
Merge b
r
an
c
h
'mg/sha1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
m
ano
"
a
d
d
-p"
:
work-
a
round an
o
ld laziness that doe
s
not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ha
m
ano
add--inte
r
active
.
perl: facto
r
ou
t
repeated -
-
recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: Editing a s
p
lit h
u
n
k in an "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -p: 'q' sh
o
uld really q
u
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
a
mano
Star
t
1
.
7
.
5
.
1 maintenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch 'mg/x-y
e
ars-12-month
s
'
into maint
commit
|
commitdiff
|
tree
2011-04-26
Junio C
H
amano
http: cl
e
ar POSTFIELDS whe
n
in
i
tia
l
izing a slo
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Juni
o
C Hamano
Merge br
a
nch 'js/maint-1
.
6
.
6-se
n
d-pack-statele
s
s-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
Gi
t
1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C
H
amano
Fix "add -u" that sometimes fails to resolve unmerged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-
f
ile
s
: show unmerged entries
c
o
rrectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remove often
unu
s
ed
p
arameters from diff
_
unmer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
d
iff
.
c
: return f
i
lepair
f
rom diff_unmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
tes
t
: u
s
e $_z40 from test-
l
ib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Haman
o
Sy
n
c with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
G
it 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Rever
t
"run-com
m
a
n
d: prettify -D
_
FORTIFY_S
O
URCE wo
r
karound"
commit
|
commitdiff
|
tree
2011-04-15
Juni
o
C Hamano
Merge
v1
.
7
.
5
-rc2 into jn/for
m
at-patch
-
do
c
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
a
mano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
ano
Merge branch 'jc/rev-list-options-f
i
x' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C
Hamano
Merge bran
c
h
'
js/che
c
ko
u
t-untrac
k
e
d-symlink' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hama
n
o
M
e
r
ge
b
ranc
h
'js/checkout-untrack
e
d-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Juni
o
C
H
amano
Merge bra
n
ch 'nd/
i
n
it-g
i
tdir
'
commit
|
commitdiff
|
tree
2011-04-11
Junio C Ha
m
ano
Merge git://git
.
bogo
m
ips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hama
n
o
Merge g
i
t://git
.
ker
n
el
.
org/pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C
Hamano
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
J
unio
C Hamano
G
it 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
mano
M
e
r
g
e
branch 'nm/main
t
-conflicted
-
submodu
l
e-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Merge branch 'mg/rev-
l
ist-n-
r
e
verse-doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch 'jk/mai
n
t
-
remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
i
o C
Ham
a
no
Merge branch
'
mg/doc-revisions-txt'
commit
|
commitdiff
|
tree
next