repo.or.cz
/
git
/
gitweb.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'
2011-05-21
Junio C Hamano
M
er
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-20
M
ichael
J
Grub
e
r
git-svn: Fix git sv
n
log --s
h
ow-c
o
m
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ham
a
no
Up
d
ate draft release
n
o
t
es to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
man
o
M
erg
e
b
ranch 'jc/
m
ai
n
t
-1
.
7
.
4
-pa
t
hspec-s
t
din-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hama
n
o
M
erge bra
n
ch 'r
g
/copy-ge
c
os-
u
se
r
name'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
M
e
rge
b
ranc
h
'jl/submo
d
ule-confl
i
cted-gitmodules'
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
io C Hamano
Merg
e
branch 'jc
/
replacing'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
M
e
rge
b
ran
c
h
'nd/sparse
-
c
o
-f
i
x'
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hama
n
o
Merge branch 'ld/p4-pr
e
serve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
Me
r
ge branch 'ms/tagname-do
e
s-not-b
e
gin-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C H
a
mano
Merg
e
branch 'jk/git-conn
e
ction-deadlock-fix'
commit
|
commitdiff
|
tree
2011-05-20
J
u
nio C
H
am
a
n
o
Merge br
a
nch 'js/main
t
-s
e
nd
-
pack-stateles
s
-rpc-de
a
dlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
J
unio C H
a
mano
Me
r
ge branch 'jk/c
h
erry-pic
k
-root-with
-
resol
v
e
'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C
Ha
m
ano
Mer
g
e branch 'jc
/
maint-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
io C H
a
m
a
no
Merge 1
.
7
.
5
.
2
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
a
mano
Reve
r
t "
M
erge branc
h
'en
/
merge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hama
n
o
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Je
f
f King
Makefile: sort
T
EST_P
R
OGR
A
MS list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan Nieder
pro
v
ide a copy o
f
t
h
e LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Jeff K
i
ng
test
core
.
gitproxy c
o
n
f
iguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
R
a
fael
G
ieschke
copy_gec
o
s: fix not adding nl
e
n to le
n
when proc
e
ssing "&"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Update rel
e
ase notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Junio C Hamano
Merge
b
ranc
h
'js/
m
aint-1
.
6
.
6-send-pack
-
statel
e
ss-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio C Hamano
M
erge
b
ranc
h
'jc/convert'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch 'ci/commit--intera
c
t
ive-atom
i
c
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e
b
ranch 's
g
/com
p
letion-updates'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Merge branch 'kk/m
a
i
n
t
-p
r
efix-in-conf
i
g-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge 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 dr
a
ft release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
branch
'
jn/
m
aint-format-patch-
d
oc
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C H
a
m
ano
M
er
g
e
br
a
nch
'
ss/cher
r
y-pick-x-
d
oc
'
i
nto m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hama
n
o
M
e
rg
e
bran
c
h 'vr
/
merge-base
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Mer
g
e branch 'sr/mai
n
t
-fast-i
m
port-tighten
-
o
ption-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
unio
C Hamano
Merge br
a
nch
'
jc/t1506-shell-param-ex
p
ansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Haman
o
Merge branch 'jc/fix
-
add-u-unmerged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io
C Haman
o
Merge br
a
n
c
h
'
j
n/gitweb-
d
e
pendency' int
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge b
r
an
c
h
'
jc/
m
aint-b
r
anch-mergeo
p
tions
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge bra
n
ch
'jc/ma
i
n
t
-
add-p-
o
verlapping-hunk
s
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documentat
i
on/git-f
s
ck
.
tx
t
: fix typo:
u
n
r
e
adable -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
send-p
a
ck: av
o
id de
a
d
lock
on git:/
/
push with fai
l
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
connect: let
c
allers know if connectio
n
i
s a socket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
c
o
nnect: treat
g
e
neric
proxy pro
c
esses
like ssh
processes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
side
b
and_demux(): fi
x
decl-after-st
m
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f
King
t3503: test che
r
ry picking and reverting root commit
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
revert: allow r
e
verting a root comm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
c
h
erry
-
pic
k
: hand
l
e r
o
o
t commits with
e
xter
n
al str
a
tegies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Syn
c
rele
a
se
n
o
t
es
f
or 1
.
7
.
6
to exclude
what are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C
Hamano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Update draft release
n
otes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
rge bran
c
h 'cn/format
-
patch
-
quiet' into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
J
unio C Hamano
Merge b
r
anch 'jm/m
e
rgetool-s
u
bmodules
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merge
b
ranch 'jk/fo
r
mat-patc
h
-quote-speci
a
l-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
Merge b
r
anch
'
vh/git-svn-doc' into ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
git_o
p
en_noatime(): drop unus
e
d parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
ni
o
C Hamano
sha1_f
i
le: typo
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
read_sha1
_
file(): allow s
e
lecti
v
e bypassing of repl
a
c
eme
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
inline looku
p
_re
p
lace_object() calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
mano
read_sha1_file():
g
et rid of r
e
ad_sha1_file_repl()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C H
a
man
o
t6
0
50: make sure we
t
e
s
t not
j
u
s
t
commit replacement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
D
e
clare
lookup_replac
e
_object() in cache
.
h, not
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Ha
m
an
o
Merg
e
bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, mer
g
e, diff: do
n
ot use strcase
c
mp to
c
om
p
are
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Jens Lehmann
S
ub
m
o
dules:
Don't par
s
e
.
gi
t
module
s
w
h
en it co
n
t
a
ins
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Hei
k
o Voigt
test tha
t
git status wor
k
s
w
ith merge conflict
in,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Luke Diamand
git-p4:
warn
i
f git a
u
thorship won
'
t be ret
a
in
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
U
pdate draft
release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Haman
o
Merge branch 'bf/commit-template-no-cl
e
anup'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merg
e
bran
c
h
'
jc/t1506-
s
hel
l
-param-e
x
pan
s
ion-gotcha'
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge b
r
an
c
h 'rr/rerere-li
b
ify-clea
r
-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge branch 'js/m
a
int-sen
d
-pa
c
k-
s
ta
t
eless-rp
c
-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branc
h
'
jh/dirstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge b
r
anch
'
jc/fix-add-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merg
e
branch 'j
n
/setup-revisions-g
l
ob-a
n
d-friends
-
passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
e
rge
branch 'cn/log-parse-
o
p
t'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
Hamano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'aw/m
a
in
t
-rebase-i-p-no-ff'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'j
s
/bla
m
e
-
parsena
m
e' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C H
a
mano
Merge
b
ra
n
ch
'
gr/
c
vsim
p
ort-alt
e
rnative-
c
v
s
pa
s
s-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Mer
g
e branch 'cj/p4merg
e
' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge branch 'jk/m
e
rge-one-file-working-tree
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Ham
a
no
Merge branch 'jc/fix-diff-file
s
-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge b
r
anch 'mz/maint-rename
-
unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400
:
Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge bra
n
ch
'
nd/
s
truct-
p
a
t
hs
p
ec'
commit
|
commitdiff
|
tree
2011-05-13
Johann
e
s Sixt
T
w
ea
k
t310
2
-l
s
-tre
e
-wildcard
s
to
run on Windo
w
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
M
e
rge branch 'jc/maint-1
.
7
.
4-pathspec-
s
tdi
n
-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merg
e
b
r
a
n
ch 'jc/main
t
-1
.
6
.
6-pathsp
e
c-stdi
n
-and
-
cmdlin
e
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio
C
Hamano
M
e
rge branch 'jc/maint-1
.
6
.
6-pathspec-
s
tdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
H
a
mano
set
u
p_revisi
o
ns()
:
ta
k
e pathspec from com
m
and line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Update
d
raft re
l
ease no
t
es
t
o 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Merge bra
n
ch '
j
n/gitweb-de
p
e
n
dency'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Me
r
ge branch 'jc/maint-branch-mergeoptio
n
s
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Me
r
ge b
r
anch 'jn/maint-test-merge-verify-par
e
nts'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merg
e
b
ranch '
v
h/config-int
e
ract
i
ve-singleke
y
-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge br
a
n
ch 'j
c
/ma
i
nt-
a
dd
-
p
-
o
verlapping-h
u
n
ks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Me
r
ge branch 'sr/maint-f
a
st-imp
o
rt-ti
g
hten-opti
o
n-parsing
'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Ham
a
no
Merge bran
c
h 'd
m
/http
-
c
leanu
p
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hama
n
o
Merge
branch 'jn/c
t
ags
'
commit
|
commitdiff
|
tree
next