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 'jk/blame-line-porcelain'
2011-05-23
J
u
nio C Hamano
Merge branc
h
'
j
k/blame-l
i
ne-por
c
elai
n
'
commit
|
commitdiff
|
tree
2011-05-21
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-20
M
i
c
hael J Gruber
gi
t
-s
v
n
:
Fix git svn lo
g
-
-sho
w
-
c
o
mm
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Ha
m
ano
Update
d
raft rel
e
ase no
t
es to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Ham
a
n
o
Merge branch 'jc/maint-1
.
7
.
4
-
pathspec-stdin-and-cmdline
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
a
mano
Merge branch 'rg/copy-gecos-usern
a
me'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Me
r
g
e bran
c
h '
j
l
/submodule-confl
i
ct
e
d-gitmodules
'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
Hamano
Merge branch 'jc/repla
c
ing'
commit
|
commitdiff
|
tree
2011-05-20
J
u
n
io C Hama
n
o
Me
r
ge
b
ranch 'nd
/
sparse-co-fix'
commit
|
commitdiff
|
tree
2011-05-20
J
unio C Hamano
Merge
b
ranch 'ld/p4
-
preserve-user-names'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
a
no
Merge
branch 'ms/tagname-does-no
t
-beg
i
n-with-dash'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
ano
Merge b
r
anch 'jk/git-con
n
ection-de
a
dl
o
c
k
-fix'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Hamano
Merge branc
h
'
j
s/maint-send-pack-
s
t
a
te
l
ess-rpc
-
d
ead
l
o
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Hamano
M
er
g
e br
a
nch 'j
k
/cherry-pick-root-w
i
th
-
resolve'
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io C
H
ama
n
o
M
erge branch 'jc/maint
-
pa
t
hs
p
e
c-s
t
di
n
-and-c
m
dl
i
ne'
commit
|
commitdiff
|
tree
2011-05-20
Junio
C
Haman
o
Merge 1
.
7
.
5
.
2
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Juni
o
C Hama
n
o
Rever
t
"Merge branch 'e
n
/merge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
i
o
C Hamano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
eff King
Makefile: sort TEST_PROGRAMS list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Jonathan
N
i
eder
provide a cop
y
of t
h
e LGPLv2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
J
e
ff K
i
ng
test
core
.
gitproxy con
f
i
g
uration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-18
Ra
f
ael Gie
s
c
hke
c
opy_gecos: fi
x
not adding nlen
t
o len when processing "
&
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
J
u
nio C
H
a
m
ano
Update
r
el
e
ase notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-17
Juni
o
C Hamano
Merg
e
branch 'js/mai
n
t-1
.
6
.
6-send-pack-statel
e
ss-
r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch
'jc/c
o
nvert'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge branch '
c
i/com
m
it-
-
int
e
r
active-atomic'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
e
rge branch 'sg/
c
ompletion-updates'
commit
|
commitdiff
|
tree
2011-05-16
J
u
n
io
C Hamano
Mer
g
e
b
r
a
nch 'kk/maint-prefix-
i
n
-config-mak'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branch 'mg
/
merge-ff-
c
onfig
'
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Haman
o
U
p
date
draft
r
elease notes
to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Juni
o
C Hamano
M
erge branc
h
'
jn/mai
n
t-f
o
rmat-patc
h
-doc'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch 'ss/
c
herry-pick
-
x-do
c
' into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hama
n
o
Merge
b
ranch
'
v
r/merge-base
-
doc'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'sr/maint-f
a
st-import-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge branch 'jc/t150
6
-s
h
ell-param-
e
xpansion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
M
e
rge
b
ranch 'jc/fix
-
add-u-unmerged'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Me
r
g
e bran
c
h 'jn/gitweb-depend
e
ncy'
into
mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge bra
n
c
h
'jc/maint-branch-me
r
geoptions' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch '
j
c/maint
-
add-
p
-
o
verla
p
ping-hunks
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
im Me
y
ering
Documen
t
at
i
on/git-
f
sck
.
t
xt: fix typo:
unreadable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Je
f
f K
i
ng
send-pack: avoid deadlock on git:// push with fa
i
led
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff
K
i
n
g
connec
t
:
let
c
a
l
l
ers know if connect
i
on is a
s
oc
k
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff King
conne
c
t
: tr
e
at
g
eneric
p
roxy proc
e
sses like ssh
proces
s
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
sideband_d
e
mux
(
): fix dec
l
-
a
fter-stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
J
e
ff King
t350
3
: test ch
e
rry picki
n
g and reverti
n
g
root
commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jef
f
King
r
e
vert: allow r
e
ve
r
ting a root commit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Jeff K
i
ng
cherry
-
p
ic
k
: handle
r
oot commi
t
s wi
t
h e
x
ternal st
r
ategies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Ham
a
no
Sync
r
e
l
e
ase note
s
for 1
.
7
.
6 to
exclu
d
e w
h
at are in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Update draft rel
e
a
se notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
a
n
o
Merge br
a
n
c
h 'cn/for
m
at-patch-quiet' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge branch 'jm/mergetool-subm
o
du
l
es'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
M
erge br
a
n
c
h 'jk/format-
p
atch-quote-special-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
un
i
o C H
a
ma
n
o
Merge branch '
v
h
/
git-
s
vn
-
doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C
H
ama
n
o
g
i
t_
o
pe
n
_noati
m
e():
d
rop unused par
a
met
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io
C
Hamano
sha1_file: typo
f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
r
e
ad_sh
a
1
_file
(
): allow se
l
ective by
p
ass
i
ng of
rep
l
acement
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
inline lo
o
k
u
p_replace_object() calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
read_sha
1
_fi
l
e(): get rid of read_sha1_file_r
e
pl()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C H
a
m
ano
t
6
050: make sure we test not
just commit replacement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Declare look
u
p_replace_objec
t
() in cache
.
h,
not
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Haman
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-15
Jonath
a
n Nie
d
e
r
add, m
e
r
ge, diff:
do
n
ot us
e
strcase
c
mp to compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
J
e
ns Lehmann
Submodules: Don't parse
.
gitmo
d
ul
e
s when it contai
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Heik
o
Voigt
test that git status work
s
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 git authorship wo
n
't be retaine
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Upd
a
te d
r
aft release notes
t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'
bf
/
commit-temp
l
ate-no-cle
a
nup'
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
Merge
bran
c
h 'jc/
t
1
5
06-shell-para
m
-expansion-got
c
h
a
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'rr/rerere
-
libify-clear-gc
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'js/maint-send-
p
ack-stateless
-
rpc-deadlock
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
n
o
Merge branch '
j
h/d
i
rstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branch 'j
c
/fix-ad
d
-u-unmerged'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branc
h
'
j
n
/setup
-
r
e
v
isio
n
s
-
glo
b
-and-frie
n
ds-p
a
ssthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cn/log-pa
r
s
e-opt'
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Ha
m
a
n
o
M
e
r
ge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Prepare fo
r
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merg
e
br
a
nch
'
a
w
/ma
i
nt-rebase-i-p-no-ff' i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hamano
Merge
bra
n
ch 'js/blam
e
-parsename
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge branch 'gr/
c
vsimport-alt
e
rnative-cvspass
-
location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C H
a
mano
Merge branch 'cj/p4merg
e
' into
maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
i
o C
Hama
n
o
Merge branch 'jk/mer
g
e-one
-
file
-
working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge branch '
j
c/fix-diff-files-un
m
erged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'mz/mai
n
t-re
n
ame-unmer
g
ed'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
J
o
han Herland
t5400: Fix
a
couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
ano
Merg
e
branch
'nd/s
t
ruct-pathspec'
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
nnes Si
x
t
Tweak t3102-ls-tree
-
wil
d
cards to
r
un on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Haman
o
Merge branch 'jc/maint-1
.
7
.
4-pathspec
-
std
i
n-an
d
-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C Hamano
Merge
branch 'jc/maint-1
.
6
.
6
-
pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Haman
o
Merge branch 'jc/maint-1
.
6
.
6-pat
h
s
pec-stdin-an
d
-c
m
dlin
e
'
commit
|
commitdiff
|
tree
2011-05-11
Jun
i
o C
H
amano
setup_revisions(): t
a
ke p
a
t
h
spe
c
from c
o
mmand li
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hamano
Update draft re
l
ease notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Ha
m
ano
Merge branc
h
'
j
n/gitw
e
b-dependency'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jc/main
t
-branc
h
-m
e
rgeoptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
mano
Merge
b
ra
n
c
h
'jn/maint-test-merge-verify-
p
arents'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hama
n
o
Merge branch 'vh/config-
i
nteractive-singlekey-d
o
c
'
commit
|
commitdiff
|
tree
2011-05-11
J
u
n
i
o
C
Haman
o
M
erge bran
c
h 'jc/maint-add-p-overlapp
i
ng-hunks
'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Merge branch 'sr/maint-fast-i
m
por
t
-
tig
h
ten-option-pa
r
sing'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
Merg
e
branch
'
dm/http-cleanup'
commit
|
commitdiff
|
tree
next