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 'jc/maint-pathspec-stdin-and-cmdline' into maint
2011-05-26
Ju
n
io C
H
a
mano
Merge
b
ranch 'jc/
m
a
int-
p
ath
s
pec-s
t
di
n
-and-cmdli
n
e'
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C H
a
mano
Merge
b
ranch 'jk/cherr
y
-pick-root-with-r
e
solve' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch
'
r
g
/copy-gecos-username' into m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-26
J
u
nio C Hamano
Merge branch 'fc/completion-
z
sh' into maint
commit
|
commitdiff
|
tree
2011-05-26
Jun
i
o C Hamano
Merge bran
c
h '
j
k
/
git-conn
e
ction-deadl
o
ck-fix' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Junio C Hamano
Merge branch 'js/m
a
int-send-pack-stateless-rpc
-
dea
d
lock
.
.
.
commit
|
commitdiff
|
tree
2011-05-26
Ju
n
io
C
H
a
m
ano
M
erge branc
h
'svn
-
fe-maint'
o
f git://repo
.
or
.
cz/git
.
.
.
commit
|
commitdiff
|
tree
2011-05-20
Ju
n
io
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
Mer
g
e branch 'js
/
maint-1
.
6
.
6-send-pack-stat
e
less-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
un
i
o
C
Ha
m
ano
Update draft rel
e
ase notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge bra
n
ch 'jn/m
a
int-format-pa
t
ch-doc' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Merge branch
'ss/cherr
y
-p
i
ck
-
x-doc
'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge
bra
n
ch 'vr
/
mer
g
e-ba
s
e
-doc'
into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
H
amano
Me
r
ge b
r
anch
'
sr/maint-f
a
s
t
-imp
o
rt-tighten-option-p
a
rs
i
ng
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge
b
ranch 'jc/t1506-shell
-
par
a
m-expansion-gotch
a
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C
H
amano
Me
r
ge
branch 'jc/f
i
x
-add-u-unmerged'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
M
erge branch 'jn/gitweb-depe
n
denc
y
' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ha
m
ano
Merge
branch 'jc/maint-b
r
anch-mergeoptio
n
s' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Mer
g
e branch
'
jc/maint-add-p-overlapping-hu
n
ks'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio
C Ha
m
ano
sideband_d
e
mux(
)
: fix decl-after
-
stmt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Hamano
Update
d
ra
f
t release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merge branch 'c
n
/format-patch-quiet' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Merge bra
n
ch
'jm/mer
g
etool-sub
m
odules
'
i
nto main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Merge b
r
anc
h
'jk/
f
ormat-p
a
tch-quote-sp
e
cial-in-fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
Me
r
ge br
a
nch
'
vh/git-svn-doc' into maint
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o C Hamano
g
it_open_no
a
time(
)
: drop u
n
used 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-13
Junio C Haman
o
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge
b
r
anch '
a
w/maint-rebase-i
-
p-no-ff' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Ham
a
no
Merge
b
r
anch 'js/
b
lame-parse
n
ame'
i
nto
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Merge branch 'gr/cvsimport-alternative-cvspass-lo
c
atio
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Hama
n
o
Merge
branch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Haman
o
Merge b
r
a
n
ch '
j
k/merge-one-file-working-tree' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'jc/fix
-
diff-f
i
les-unm
e
rged' i
n
to
m
ain
t
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o C Hamano
Merge br
a
n
ch
'mz
/
maint-rename-unmer
g
ed' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-11
J
un
i
o C Hamano
Merge branch 'jc/main
t
-1
.
7
.
4-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C
Hamano
Merge branch 'jc/maint-1
.
6
.
6-pathspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Haman
o
s
etup_revis
i
ons():
tak
e
pathspec from command line
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
t1507: avoid "${parameter<op>'wo
r
d'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add
-
p-fix m
a
kes the last test to pa
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
merge:
make branc
h
.
<name>
.
m
ergeoptions correctly
o
ve
r
r
ide
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C
Hamano
Merge branch 'js/ma
i
nt-1
.
6
.
6-send-
p
a
c
k
-
stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix here
document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C Ha
m
ano
Merg
e
branc
h
'jh/dirstat' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C Ham
a
no
Merge bran
c
h 'sp/maint-c
l
ear-
p
ostfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
Ha
m
ano
Merge
branch 'j
k
/ma
i
nt-stash-oob' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ham
a
no
Merge branch 'jk/ma
i
nt-upload-pack-shallow'
into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branch 'dm/stash
-
k
-i-p'
into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o C Haman
o
Me
r
ge branch '
j
c/pack-objects
-
bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
Merge
b
r
a
nch 'mg/refl
o
g-w
i
th-o
p
tion
s
' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Ham
a
no
Merge branch 'j
k
/stash-loosen-s
a
f
ety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'
ar/cle
a
n-rmdir-e
m
pt
y
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
H
amano
Mer
g
e branch
'
mg/sha1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hamano
"add -p": work-arou
n
d a
n
old laziness that does
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
H
a
mano
ad
d
--i
n
teractive
.
perl: factor out
r
e
p
eate
d
-
-recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hama
n
o
t3701: Editing a s
p
lit hun
k
in
a
n "add -p"
session
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add
-
p:
'q
'
shoul
d
r
e
a
lly qu
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1
main
t
enance trac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
M
e
rge
branch 'mg/x-years
-
1
2-months' into main
t
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio C Ha
m
ano
ht
t
p: clear POS
T
FIELDS
w
hen initializing a s
l
ot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-25
J
unio C Haman
o
Merge branch 'js/m
a
i
nt
-
1
.
6
.
6-send-pack-st
a
teless-
r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
H
ama
n
o
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio
C
Ham
a
n
o
Fix "ad
d
-
u
" that sometimes fa
i
l
s
to
r
esolve u
n
m
e
rge
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff-fil
e
s: show unmerged entr
i
es correct
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff:
r
emove often unused para
m
ete
r
s
from diff_u
n
merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c:
return f
i
l
e
pa
i
r from diff_unm
e
rge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
tes
t
:
use $_z40 from t
e
st-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Hama
n
o
Gi
t
1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Haman
o
Sync with
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
mano
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-command: pre
t
tify -D_FORTIF
Y
_S
O
URCE work
a
ro
u
nd"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Ha
m
ano
M
e
rge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Hamano
Gi
t
1
.
7
.
5
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio
C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Merge bran
c
h 'jc/re
v
-l
i
st-options-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch 'js/
c
h
e
ckout-untrack
e
d-symlink' in
t
o
maint
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge b
r
a
n
ch
'js/checkout-untr
a
cked
-
symlink'
commit
|
commitdiff
|
tree
2011-04-12
J
u
n
i
o
C Hamano
Merge br
a
n
c
h
'
nd/
i
nit-gitdir'
commit
|
commitdiff
|
tree
2011-04-11
J
u
nio C Hama
n
o
Merge
g
it://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2011-04-11
J
u
nio C Hamano
Merge
g
it://git
.
kerne
l
.
o
r
g
/pub/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
Git 1
.
7
.
5
-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Ham
a
n
o
Sync wit
h
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch
'nm
/
ma
i
nt-
c
onflicte
d
-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
unio
C Ham
a
no
Merge branch 'mg
/
rev-l
i
st-n-reverse-doc' into maint
commit
|
commitdiff
|
tree
2011-04-06
J
unio C Hamano
Mer
g
e bra
n
ch 'jk/maint-remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Hamano
Merge branch 'mg/doc-rev
i
sions-txt'
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
i
o C
Hamano
Teac
h
co
r
e
.
bigfilethreas
h
old to
p
ack-objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
io C Hamano
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C Hamano
Merge branch 'jl/submodul
e
-fetch-on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'jc/r
e
v-list-optio
n
s-fix'
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Hamano
Merge branch 'nm/maint-conflicted
-
submodule-entri
e
s'
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
am
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
ma
n
o
St
a
rt p
r
eparing for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio
C H
a
ma
n
o
Merge branc
h
'
jc
/
index-
u
p
da
t
e-if-abl
e
' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C
Hamano
M
e
r
g
e branch 'lt/default-abbrev' into
m
a
int
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
e
r
ge br
a
nch 'j
c
/main
t
-rev
-
list-culled-boundary' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio
C Hamano
Merge bra
n
ch 'mm/maint-lo
g
-
n
-with-d
i
ff-fil
t
ering'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Ham
a
no
Merge branch '
j
k/
f
ormat-pat
c
h-multiline-hea
d
er' into
.
.
.
commit
|
commitdiff
|
tree
next