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/magic-pathspec'
2011-05-23
Junio
C
Haman
o
Merge b
r
an
c
h '
j
c/magi
c
-pathspec'
commit
|
commitdiff
|
tree
2011-05-23
Junio C Haman
o
Merge bran
c
h 'j
k
/blame-line-porcela
i
n
'
commit
|
commitdiff
|
tree
2011-05-21
Ju
n
i
o
C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-05-20
Michael J
Gruber
git-svn:
Fix git sv
n
l
og --show-co
m
mit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Upda
t
e
dr
a
ft
release notes to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
erg
e
branc
h
'
j
c
/maint-1
.
7
.
4-pa
t
hspec-stdi
n
-and-cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hamano
Merg
e
branch 'rg/copy-gecos-username'
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
io
C
Hamano
Merge branc
h
'
j
l/su
b
m
o
dule-c
o
nflicted-gitmodules'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Me
r
ge branch 'jc/replacing'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C Hamano
Merge branch
'
nd
/
spar
s
e
-
co-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Haman
o
Merge branch 'ld
/
p4-
p
reserve
-
user-nam
e
s'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Hama
n
o
Merg
e
br
a
nch 'ms/tag
n
ame
-
d
oes-not-beg
i
n-wit
h
-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hama
n
o
Merge branch 'jk/git-
c
onnect
i
on-deadlock-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branch 'js/mai
n
t
-s
e
nd-pack-
s
tateless-rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hamano
M
er
g
e
b
ranch 'jk/che
r
ry-pick-root-w
i
th
-
res
o
lve'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
i
o
C Ha
m
ano
Mer
g
e branch 'jc
/
m
a
int-p
a
thsp
e
c-stdi
n
-and-cm
d
line'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C Hama
n
o
Merge 1
.
7
.
5
.
2 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o
C H
a
mano
Revert "Merge branch
'
e
n
/
me
r
g
e-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C
Hamano
Git 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jeff
K
ing
Makefile: sort TEST
_
PROGRAMS list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan
N
ieder
provide a cop
y
of the LGPLv
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Jeff King
test core
.
gitpro
x
y configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Ra
f
ael
G
ieschke
c
o
py_g
e
cos: fix
not ad
d
i
ng nl
e
n
t
o
l
en when
p
r
ocessi
n
g
"
&
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-18
Ramsay
J
one
s
setup
.
c
: Fix
s
o
m
e
"s
y
m
bol not decl
a
red" sparse warnings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
J
unio C
H
a
mano
Update release n
o
te
s
to
1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge branch 'js/mai
n
t-1
.
6
.
6-
s
end-
p
ack-stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
m
a
no
Merge branch 'jc/c
o
nve
r
t'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge bran
c
h 'ci/commi
t
-
-
intera
c
tive-atomic'
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
i
o C Hamano
Merge
b
ra
n
ch 'sg/c
o
m
p
l
e
tion-updates'
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
Merge branch
'kk/maint-prefix
-
i
n
-
co
n
fig-m
a
k'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Me
r
ge bran
c
h 'mg/merge-ff-config'
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
e
rge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o C
Haman
o
Update draft release
n
otes to
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C
Hamano
Merge br
a
nch 'jn/maint-fo
r
mat-patch
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge
b
ranch 'ss/ch
e
rry-pic
k
-x-doc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hama
n
o
Mer
g
e branch 'vr/merge-base-doc'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'sr/maint-f
a
st-import
-
tigh
t
en-
o
ption-pars
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C
H
amano
Merge branch '
j
c
/
t150
6
-shel
l
-param-e
x
pansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'j
c
/fix-add-u-u
n
merged' into maint
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C Ham
a
no
Merge
b
ranch 'jn/
g
i
tweb-dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
r
ge bra
n
ch 'jc/ma
i
nt-
b
ranch-
m
er
g
eopti
o
ns' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
a
mano
Merge branch 'jc/maint
-
add-p-overlappi
n
g-hunks'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyer
i
ng
D
o
c
um
e
n
tation/git-
f
sc
k
.
txt:
fix typo
:
u
n
r
e
ad
a
ble -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send
-
pa
c
k: a
v
oid dea
d
loc
k
on git:// push wit
h
failed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
King
connect: let callers
know
if connection is a socket
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
connec
t
: treat generic
p
r
o
xy
proce
s
ses like ss
h
proces
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
sid
e
band_demux(): f
i
x decl-a
f
t
er-stmt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
i
n
g
t3503: te
s
t
c
herry picking a
n
d
reverting root c
o
mmits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
r
e
v
ert: allow reve
r
t
i
n
g
a roo
t
commit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
herry-p
i
c
k
: handle root comm
i
ts with external st
r
ategies
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C H
a
mano
Sync release
note
s
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 Hamano
Me
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
Update
dr
a
ft re
l
ease
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 Hamano
Merge
b
ranch
'c
n
/format-patch-quiet' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
b
ranch
'jm/mergeto
o
l-submodules' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge branch 'jk/format
-
p
atch-quote-
s
peci
a
l-in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ha
m
a
no
Merge
b
ranc
h
'vh/
g
i
t
-svn-doc' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
git_op
e
n_noati
m
e
(
):
drop
unused p
a
rameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hama
n
o
sha1_fi
l
e: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
read_sha1_file
(
): allow
selective bypa
s
sing of
r
eplac
e
ment
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
H
amano
in
l
ine
l
ookup_replace_ob
j
ect() calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
n
o
rea
d
_sha1_file(): get r
i
d
o
f
re
a
d_
s
h
a1_file
_
re
p
l()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
t6050: make sure we test not just comm
i
t repl
a
cement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
D
eclare l
o
o
kup_rep
l
ace_object() in cac
h
e
.
h, not in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2011-05-15
J
onath
a
n Nieder
add, merg
e
, diff: do not us
e
strcas
e
cmp to compare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-14
Jens Lehman
n
Submodules:
Don't
parse
.
gi
t
modules when it con
t
ain
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-14
Heiko
Voigt
t
est that git status works
with merge conflict in,
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Luke Diamand
g
i
t
-
p4: warn if g
i
t aut
h
orship
w
on't be
r
etained
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Update draft release note
s
to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
M
erge branch 'bf/com
m
it-template-no-cleanup'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge branch 'jc/t1506
-
shell-p
a
ram-expansion-gotch
a
'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ham
a
no
Merge branch '
r
r
/
rerere-libify
-
clear-g
c
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge br
a
nch 'js/maint-send-pack-stateless
-
rpc
-
deadl
o
ck
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C
H
a
mano
Merge branch 'jh/dirstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C Haman
o
M
e
rge b
r
anch '
j
c/fix-
a
dd-u-unmerged
'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
Merge b
r
anc
h
'jn/setup
-
revisions-g
l
ob-and-fr
i
ends
-
passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge bra
n
ch 'cn/log-parse-opt
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Pre
p
are
for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
Hamano
M
erge
b
r
a
nc
h
'aw/maint-
r
ebase
-
i
-
p
-no-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Me
r
ge branch
'js/blam
e
-parsename' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e
b
ranch 'gr/cvsimp
o
rt-alternative-cvspass-locati
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch '
c
j
/
p
4
merg
e
' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
b
r
a
n
ch 'jk/merge-one-file-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch
'jc/fix-d
i
f
f
-files-unme
r
ged' into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
r
g
e b
r
anc
h
'
m
z
/ma
i
nt-rename-unmerged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400:
F
ix a
c
ouple
of t
y
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
Hamano
Merge bra
n
ch 'nd/struct-p
a
thspec'
commit
|
commitdiff
|
tree
2011-05-13
Johannes Sixt
Tw
e
a
k t3102-
l
s
-tree-wildcard
s
to run on
Window
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
J
ohannes Sixt
t3703: Skip tests using direc
t
ory name ":" o
n
Win
d
ow
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ha
m
a
no
Merge bra
n
c
h
'jc/maint-1
.
7
.
4
-
pa
t
hspec-s
t
din-and
-
cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hamano
M
e
r
g
e bran
c
h
'
jc/maint-1
.
6
.
6-p
a
t
h
s
p
ec-stdin-
a
nd
-
cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
revisi
o
n
.
c: leave
a
note for "a lone :" enhancement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc/ma
i
n
t
-
1
.
6
.
6
-pathspec-stdin-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Ham
a
no
Me
r
g
e branch
'
jc/
m
aint-
1
.
6
.
6-pathspec
-
s
t
d
in-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
setup_revisions():
take pa
t
hspec fro
m
comm
a
nd li
n
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
J
unio C
Ham
a
no
Upd
a
te draft relea
s
e notes
t
o 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e
branch '
j
n/gitweb-depe
n
de
n
cy'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch
'
jc/maint-branch-mergeoptions'
commit
|
commitdiff
|
tree
next