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/cherry-pick-root-with-resolve'
2011-05-20
Junio C Haman
o
Merge branch 'jk/cherry-pick-root-with-
r
e
so
l
ve'
commit
|
commitdiff
|
tree
2011-05-20
Junio C
H
am
a
no
Merg
e
b
ranch 'jc
/
main
t
-pathspec-stdi
n
-and-cmdl
i
ne'
commit
|
commitdiff
|
tree
2011-05-20
Junio C Ha
m
ano
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 Haman
o
Reve
r
t
"Merge
b
ra
n
c
h 'en/me
r
ge-recursive'"
commit
|
commitdiff
|
tree
2011-05-20
Jun
i
o C Ha
m
a
no
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
U
p
date release notes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merge branch '
j
c
/
co
n
vert'
commit
|
commitdiff
|
tree
2011-05-16
J
u
ni
o
C
H
amano
Merge
branch '
c
i/commit--
i
nteractive-atom
i
c'
commit
|
commitdiff
|
tree
2011-05-16
J
u
nio C
H
amano
Merge br
a
nch 'sg/completi
o
n-upda
t
e
s'
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Mer
g
e
branc
h
'
k
k/ma
i
nt-p
r
efix
-
i
n-config-mak'
commit
|
commitdiff
|
tree
2011-05-16
J
uni
o
C
Hamano
Merge bran
c
h
'm
g
/merge-
f
f-co
n
fig'
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge br
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o C Hamano
Up
d
ate draft release no
t
es to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hama
n
o
Merge branch 'jn/maint-format-pa
t
c
h-
d
oc' in
t
o main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
Merge
bra
n
ch 'ss/c
h
err
y
-pick-x-doc'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Ha
m
an
o
Merge branch '
v
r/merge-
b
a
s
e-doc' into maint
commit
|
commitdiff
|
tree
2011-05-16
Jun
i
o
C Hamano
Merg
e
b
r
anch 'sr/m
a
int-fast
-
i
m
port-tighten-option-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Haman
o
Merge branch 'jc/
t
15
0
6-sh
e
ll-param-expan
s
io
n
-go
t
cha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C H
a
mano
Merge branch 'jc/fix-a
d
d-u-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Me
r
ge b
r
a
n
ch 'jn/gi
t
web
-
dependency' into maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merg
e
b
r
anch
'
jc/maint-branch-
m
e
r
ge
o
ption
s
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
Mer
g
e branch
'jc/maint
-
add-p-o
v
erlapping-hunks
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio C H
a
m
a
no
S
y
nc
r
e
l
e
ase notes for 1
.
7
.
6
to exclu
d
e what are
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Ha
m
a
no
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Ha
m
ano
Update draft
release notes to 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
Hamano
Merge branch '
c
n/format
-
p
atch-quiet' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
i
o C Haman
o
Merge branch 'jm/mergetool-
s
ubmodules'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C H
a
mano
Merge bra
n
ch '
j
k/format-
p
atch-quote-sp
e
cial-
i
n
-
from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
J
unio C
Hamano
Merge
branch 'vh/git-svn-doc' in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ham
a
no
git_open_noatime(): drop
un
u
s
ed pa
r
amet
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C Hamano
s
ha1_f
i
le: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
H
a
mano
Update dr
a
ft release n
o
tes to
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge branch 'bf/com
m
it
-
template-no-cleanup'
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branc
h
'jc/t150
6
-shell-par
a
m-
e
xpans
i
on-g
o
tcha'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'rr/rerer
e
-libify-
c
lea
r
-gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Merg
e
b
ranch 'js/maint
-
s
end-pack-stateless-rpc-de
a
d
l
o
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C
H
amano
Merge
bra
n
ch
'jh/dirstat-li
n
es
'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
H
a
mano
Merge branc
h
'jc/fix-add-u-unme
r
ged'
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
Merge branch 'jn/setup-r
e
visions-glob-an
d
-friends-pas
s
thru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'c
n
/log-parse-opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
a
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Pr
e
pare
for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge b
r
anch 'aw/maint-re
b
ase-i-p-no-ff' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch
'
js/blame-pars
e
name' into m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C
Hamano
Merge b
r
anch
'
gr/cvsimport-a
l
te
r
native-cvspa
s
s-
l
ocation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'cj/p4merge' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-one-file-work
i
ng
-
tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch
'jc/fix-diff-file
s
-unmerged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merg
e
branch 'mz/maint-rename-unmer
g
ed' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merg
e
b
r
anch 'nd/struct-pat
h
sp
e
c'
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Me
r
ge
b
r
a
nch 'jc/maint-1
.
7
.
4
-
p
at
h
spec-stdin-a
n
d
-
cm
d
line'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
Me
r
ge branch
'
jc/
m
aint-1
.
6
.
6-
p
athspe
c
-stdin-and-cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
set
u
p_revisi
o
n
s(): take
pa
t
h
s
pec fr
o
m command l
i
ne
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C
Hamano
Update dr
a
ft rel
e
ase notes
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio
C
Ha
m
ano
Merge b
r
an
c
h 'jn/gitw
e
b
-depe
n
dency'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hama
n
o
Merge branch 'jc/main
t
-br
a
nch-
m
ergeoption
s
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge branch 'jn/maint-test
-
merge
-
verify-parents'
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Ham
a
no
Merge branch 'vh/confi
g
-interac
t
ive-singleke
y
-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
ama
n
o
Merge branch 'jc/maint
-
a
dd-p-overlapping
-
hunks'
commit
|
commitdiff
|
tree
2011-05-11
Junio C H
a
m
ano
Mer
g
e b
r
a
nch 'sr/m
a
i
n
t-fast-import-tig
h
ten-option-p
a
rsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge b
r
a
nch 'dm/http-cleanup
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
M
e
rge branch '
j
n/ctag
s
'
commit
|
commitdiff
|
tree
2011-05-10
J
u
n
io C Ha
m
an
o
Mer
g
e branch 'fc/completion-zsh'
i
n
t
o sg/completion
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Juni
o
C Hama
n
o
Re
v
ert
"comple
t
io
n
: don't
d
eclare 'local w
o
r
d
s' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C
H
a
man
o
Rev
e
r
t
"
Honor $(prefix) s
e
t in
config
.
mak
*
when defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
conver
t
: make
it
harder to screw up
adding a conversio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio C Haman
o
conver
t
:
make it safer to add conversion
a
t
tribute
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert: give saner names to crlf/eol v
a
ri
a
b
l
es,
t
ypes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
con
v
ert: rena
m
e
t
h
e "
e
ol" global
v
a
r
iable to "core_eol"
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
'
}" insid
e
do
u
ble
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C
H
aman
o
t3701: add-p-
f
ix makes the las
t
test to pass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ju
n
io C Ha
m
ano
rerere: libif
y
re
r
ere_clear
(
) and r
e
rere_gc
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o
C
H
a
m
a
n
o
merge: introduce
m
erge
.
ff config
u
ration var
i
ab
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hamano
Merge branc
h
'jc/
m
ain
t
-
branch-mergeoption
s
' into
m
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hama
n
o
mer
g
e:
m
ake branch
.
<name>
.
mergeo
p
ti
o
ns correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Update draft release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C H
a
man
o
Merge branch
'jn/run
-
command
-
error-fai
l
ure'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rge branch 'js/info-man-pat
h
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rg
e
br
a
nch 'im/hashcmp
-
optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge branch 'jk/merge-one-fi
l
e
-
wo
r
k
i
ng-tree'
commit
|
commitdiff
|
tree
2011-05-06
Juni
o
C
Hama
n
o
M
erge branch 'jc/fi
x
-d
i
ff-files-
u
nmer
g
ed'
commit
|
commitdiff
|
tree
2011-05-06
J
un
i
o C Hamano
Merge br
a
n
c
h
'cj/p
4
merge'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
H
a
m
a
n
o
M
erge branch
'
gr/c
v
si
m
por
t
-
a
lternat
i
ve-cv
s
pas
s
-location'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C
Ham
a
no
Merg
e
branch
'
sg/completi
o
n-clean
u
p'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Haman
o
Mer
g
e
b
r
anch 'js/blame-
p
a
r
sen
a
me
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge br
a
nch
'j
k
/format-patch-quot
e
-special-
i
n
-
from'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
Merge bra
n
ch
'
nd
/
struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C
H
ama
n
o
Merge bran
c
h 'aw/maint-rebase-i-
p
-no-ff'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Me
r
ge branch 'mg/alias-e
x
pos
e
-pr
e
f
i
x'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
Merge b
r
anch 'mg/diff-ui
c
o
n
f
ig-doc'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge br
a
nch 'maint
'
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
M
erge
b
ranch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2011-05-05
Junio C
H
amano
Merge br
a
nch 'js/maint
-
1
.
6
.
6-se
n
d-pack-stateless-r
p
c
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hamano
t3701: fix he
r
e do
c
ument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
U
pd
a
te draft releas
e
not
e
s t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
m
a
n
o
M
e
rge branch
'ml/t
e
st-re
a
dme'
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch 'ft/gitweb-ta
r
-with-gzip-n
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Mer
g
e branch
'mg/rev-
l
is
t
-coun
t
-cherry'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merg
e
b
ranch
'ss/doc-svn'
commit
|
commitdiff
|
tree
next