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 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
2011-05-20
Junio C H
a
mano
Merge bran
c
h 'j
c
/maint
-
1
.
7
.
4-
p
a
thspe
c
-stdin-a
n
d-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Hamano
Mer
g
e bra
n
ch 'rg/copy-gec
o
s-username'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Me
r
ge branch 'jl/submodu
l
e-confl
i
cted-g
i
tmodules'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Hamano
Merge
branch
'
jc/rep
l
a
c
ing'
commit
|
commitdiff
|
tree
2011-05-20
J
u
ni
o
C
Hamano
Merge
b
ranch '
n
d/
s
parse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
a
n
o
Merge branch 'ld/p4-preserve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C Hama
n
o
Merg
e
branch 'ms/tag
n
ame-
d
oes
-
not-begi
n
-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C H
a
mano
Merg
e
branch 'jk/git-co
n
nec
t
ion-dea
d
loc
k
-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'js/maint
-
sen
d
-p
a
ck
-
s
t
ateless-rp
c
-
d
eadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio C Haman
o
Mer
g
e bra
n
c
h
'
jk/c
h
erry-pic
k
-
r
oot-with-resolve'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
aman
o
M
e
r
ge branch 'jc/
m
aint-pat
h
spec-s
t
din-and-cm
d
l
ine'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Haman
o
Merge 1
.
7
.
5
.
2 in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
R
evert
"
Merge branch 'en/merge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jeff King
Mak
e
fi
l
e: sort TES
T
_PROGRAMS list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
on
a
than Nieder
provide
a
copy of the L
G
PLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitprox
y
configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Rafael Gie
s
chke
copy_ge
c
os: fix no
t
a
d
d
i
n
g nlen
t
o
l
en when pro
c
e
s
sing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Haman
o
Update release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Ham
a
no
Merge branch 'js/maint-1
.
6
.
6-s
e
nd-pack-statel
e
ss-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ha
m
ano
Merge branch 'jc/conve
r
t
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Hamano
Merge bra
n
c
h
'ci/commi
t
--in
t
eractive-
a
tomic'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge bra
n
c
h
'sg/completion-updates'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Me
r
ge branch 'kk
/
maint-
p
refix-i
n
-config-m
a
k'
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C Hama
n
o
Merge branch 'mg/merge
-
ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Update draft
r
e
lease notes
t
o 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Ha
m
ano
M
e
r
g
e
b
ranch
'
j
n/mai
n
t-format-patch-doc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch 'ss/che
r
ry-pick-x-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Mer
g
e bran
c
h 'vr/me
r
ge-base-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bran
c
h
'sr/maint-fa
s
t-
i
mpor
t
-ti
g
h
t
en-option
-
parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch
'jc/t1506-shell-param-expans
i
on-gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Merge branch
'jc/fix-add-u-unmerged' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
a
n
o
Merge
b
ranc
h
'jn/gitwe
b
-d
e
pen
d
ency' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
a
m
ano
Merge bra
n
ch 'jc/mai
n
t-b
r
a
n
ch-merg
e
o
ptions' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io C
H
am
a
no
Merg
e
branch '
j
c
/maint-add-p-overla
p
p
ing-hunks' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Do
c
umentation/git-
f
sck
.
tx
t
: fix typo: unreadable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
s
e
n
d
-pack: av
o
id
d
eadlo
c
k on git:// push with
failed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connect
:
let
c
allers know
i
f connect
i
on is a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
conn
e
ct
:
treat
generic proxy processes like ssh proc
e
sses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Haman
o
sideband_demu
x
(
)
: fix d
e
cl-after-stm
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
t3503
:
test
cherry pickin
g
and reverting
root co
m
mits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
reve
r
t: allow re
v
er
t
ing a root comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff Ki
n
g
cherry-p
i
ck: handle root
c
o
m
m
i
ts with external strategie
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
S
ync relea
s
e notes for 1
.
7
.
6 to
exclude what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
ama
n
o
Update 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
unio
C
Hamano
Merge
b
r
anch
'
c
n/for
m
at-patch-quiet' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merge branc
h
'jm
/
merge
t
o
ol-submodules' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Merge br
a
nch
'
jk/format
-
patch-qu
o
te-special-in
-
from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C
H
a
m
ano
Merge
b
r
anch 'vh/git-s
v
n-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
a
mano
git_
o
p
en_noatime(): drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_fi
l
e: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
H
amano
read_
s
ha1_f
i
le():
allow selec
t
i
v
e bypassing of r
e
pl
a
c
e
ment
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
in
l
ine lookup_replace
_
obj
e
ct()
c
alls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C
H
amano
read_s
h
a1_fi
l
e()
:
get
r
id of
read_sha1_fil
e
_re
p
l()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
t6
0
50: make sure we t
e
s
t
not just
c
ommit replacement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Declare lookup_replac
e
_
o
b
j
ect() in cache
.
h, not in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
a
dd, mer
g
e, d
i
ff
:
do not use strca
s
ecmp to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
J
e
ns Lehmann
Su
b
modules: Don
'
t
parse
.
gitmodules when it contain
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Heiko Voig
t
tes
t
tha
t
git status works with merge conf
l
ict i
n
,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
L
u
ke Diamand
g
i
t-p
4
: warn if git authorship won't
be retained
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Up
d
ate
d
raft release notes t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Ha
m
ano
Merg
e
branch 'bf/commit-template-no-clea
n
up'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge branc
h
'jc/t1506-s
h
ell-param-ex
p
ansion
-
gotcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merge
b
ra
n
ch 'rr/re
r
e
re-libify
-
clear-gc'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
M
e
rge b
r
anch
'js/maint-
s
end-pack-statele
s
s-rp
c
-dea
d
l
ock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
H
amano
Merge branch 'jh/dir
s
tat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch '
j
c/fix-a
d
d-u-unmerg
e
d'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Mer
g
e
b
ranc
h
'jn/setup-
r
evisions-glob
-
and-frie
n
d
s-passth
r
u'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
Hamano
Merge branch '
c
n
/
l
o
g-
p
arse
-
opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Ha
m
an
o
Merge bran
c
h 'aw/main
t
-rebase-i-p
-
no
-
ff' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branch 'js/blame
-
parsena
m
e' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C Hamano
Merge branch 'gr/cvsi
m
p
o
r
t-alternative-cvspass
-
location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'cj/p4merge
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
H
amano
M
e
r
ge branch 'jk/merge-one-file-work
i
ng-t
r
e
e' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C Ham
a
n
o
M
e
r
g
e branch
'jc/fix-diff-files-unmerged
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'm
z
/m
a
int-r
e
name-un
m
erg
e
d
'
i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-13
J
o
h
an Herland
t540
0
:
Fix
a
c
ouple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C H
a
mano
M
erge branch 'nd/struct-path
s
pec'
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n
n
es Sixt
Tw
e
ak t
3
102-
l
s-tree-wildcards to
run on W
i
ndows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'
jc/maint
-
1
.
7
.
4-pathspec-stdin-and-
c
mdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Haman
o
Merge branch 'jc/maint-1
.
6
.
6-pathspec-stdin-and-
c
mdline
'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Me
r
g
e
branch '
j
c
/
maint-1
.
6
.
6-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
setup_revisio
n
s():
t
ake pathspec
from command line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Update draft
r
el
e
ase notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Haman
o
M
e
r
ge bran
c
h 'jn
/
gi
t
web
-
dependenc
y
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
branc
h
'jc/mai
n
t
-branc
h
-mergeop
t
ions'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
io C
H
aman
o
Mer
g
e
b
ranch
'jn/maint-test-me
r
ge-verify
-
pare
n
t
s
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio
C
Hama
n
o
Merge branch 'vh/co
n
fig-interactive-sin
g
lekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
H
a
mano
Merge branch 'jc
/
m
a
i
nt-add-p-overlapping
-
hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
M
erge branch
's
r
/maint-f
a
st-
i
mport-t
i
ghten-option-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
i
o
C Hamano
Merge branch 'dm/h
t
tp-cleanup'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Ha
m
a
n
o
Me
r
ge bran
c
h
'jn/ctags'
commit
|
commitdiff
|
tree
2011-05-11
Boris Faure
D
o not
s
t
r
ip empty lines
/
trailing space
s
f
r
o
m
a co
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
J
u
nio
C H
a
man
o
Mer
g
e
branch 'fc/complet
i
on-zsh' into sg/completion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Juni
o
C
H
amano
Revert "completion: do
n
't decla
r
e 'local wor
d
s' to
.
.
.
commit
|
commitdiff
|
tree
next