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/doc-git-updates'
2012-07-22
J
unio C
Hama
n
o
Merge
b
r
anch 'j
k
/
p
u
sh-delete
-
ref-error-mess
a
ge' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o C
H
amano
Merge branc
h
'ar/clone-honor-umask-
a
t
-
top'
into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
amano
Merge branc
h
'
c
w/amend-commi
t
-without-message'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'jk/ma
i
nt-commit-ame
n
d-only-n
o
-paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hama
n
o
Me
r
ge b
r
a
n
ch 't
g
/main
t
-cache-name-comp
a
r
e' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hama
n
o
Merge branc
h
'tr/m
a
int
-
show
-
walk' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branc
h
'jc/refactor-d
i
ff-stdin' into maint
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C H
a
mano
Merge
b
ranch 'mz/empty-rebase-test' into maint
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Merge bran
c
h 'js/fast-expo
r
t-paths-with-spaces' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io
C
Hama
n
o
Merge branch 'cw
/
no-detaching-an-unbor
n
' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Merge
branch 'vr/use-ou
r
-
p
erl-i
n
-tests' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Hamano
Me
r
ge git
:
//bo
g
omip
s
.
org/git-sv
n
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merg
e
branch 'jk/
r
evisio
n
-walk-s
t
op-at-max-count'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ham
a
no
Merg
e
branch 'mm/conf
i
g-xdg'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Ha
m
ano
M
erge branch 'as/t4012-
s
t
y
le-u
p
dates'
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C H
a
mano
Merge
b
ranc
h
'pg/ma
i
nt-1
.
7
.
9-
a
m-w
h
ere-is
-
patch'
commit
|
commitdiff
|
tree
2012-07-22
J
unio
C
H
ama
n
o
Merge bra
n
ch 'jl/
m
ain
t
-1
.
7
.
10-recurs
e
-
s
ubmodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Hamano
Merge
branch 'ms/daemon-doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Mer
g
e bra
n
ch 'l
k
/
m
ore-hel
p
ful-status-h
i
nts'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
Ham
a
no
Merg
e
b
r
anch 'jc/sha1-na
m
e-
m
o
re'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merg
e
branch
'
jc/maint-filter-branch-epoch-date'
commit
|
commitdiff
|
tree
2012-07-18
J
unio C
Hamano
di
f
f: correctly di
s
ab
l
e external_diff with --no-ext
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-17
Jun
i
o
C H
a
mano
R
ever
t
"
git-commit-
t
re
e
(1)
:
update
s
ynopsis"
commit
|
commitdiff
|
tree
2012-07-17
Junio C Hamano
Merg
e
branch 'k
k
/maint-1
.
7
.
9
-
c
ommit-tree' into kk/maint
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Junio C
H
ama
n
o
commit-tree:
resurrec
t
comman
d
l
ine
parsing
u
pdates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Upd
a
te
dra
f
t
r
el
e
as
e
notes
f
or 7th
b
atch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge branch 'tg/maint-cache-name
-
compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
Merge branch
'jk/index-
p
ack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
i
o
C Ha
m
ano
Merge branch 'jk
/
maint
-
c
o
m
mit-amend-only-no-path
s
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Merge
b
ranch 'c
w
/amend-commit
-
wit
h
out-message'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Merge branch '
j
n/makefile-clea
n
u
p
'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C
Ha
m
ano
Mer
g
e branch 'ar/cl
o
ne-honor-
u
mask-
a
t-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'jc/ap
p
ly-
3
way'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Merge branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Ham
a
no
Me
r
g
e branch 'pw/gi
t
-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Ju
n
io C Haman
o
Merge
b
ranch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
J
unio C
Hamano
Merge branch 'jk/push-dele
t
e-ref
-
erro
r
-
m
ess
a
ge'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Sixth batc
h
for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
H
aman
o
Merge branch 'jc/refactor
-
d
i
ff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Merge
b
ranch
'tg/c
e
-
namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Me
r
ge br
a
n
c
h
'
t
b
/sanitize-decom
p
osed-utf-8-pathname
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge b
r
a
nch 'mm/mediaw
i
ki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bran
c
h
'jn/vcs
-
svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Mer
g
e branch 'm
m
/mediawiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
erge bran
c
h 'tr/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio
C
Hamano
M
erge branch 'mz/rebase-no-mbo
x
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t151
2
:
match th
e
"other" object
na
m
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
u
nio C
H
amano
t7
0
03
:
add
t
est to filter a branch with a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
date
.
c: Fix off by one
e
rror in object-header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t
1512: ignore whitespaces in
wc -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Red
u
ce draft release notes
t
o
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Syn
c
w
i
th 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hama
n
o
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hama
n
o
Me
r
g
e bran
c
h 'jc/main
t
-blame-unique-abb
r
e
v' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Ha
m
an
o
Merg
e
b
ranch 'rj/
p
latfor
m
-pread-may-be-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Mer
g
e b
r
anch
'th
/
diff-
n
o-index-fixes' i
n
to m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
a
mano
Merge branc
h
'nd/clone-single-
f
i
x' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
aman
o
Merge bran
c
h 'jc/rev-list-
s
implify
-
merges-first-paren
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge branch 'h
v
/
s
ubm
o
dule-
u
pda
t
e-nuke
-
submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
a
no
Merge br
a
nch 'jk/diff-no-index-pager' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
H
amano
Me
r
ge branch 'mm/
v
erify-fi
l
enam
e
-fix'
i
n
to
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'cn/cherry-pi
c
k-range-doc
s
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Me
r
g
e
branc
h
'jc/usta
r
-chec
k
sum-is-u
n
s
i
gned'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branch 'jc/bundle-
c
omplete-not
i
c
e
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hama
n
o
Me
r
g
e branch 'jc/ls-files-i-dir'
i
nt
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge
b
ranch 'jc/request-pull-ma
t
ch-tagname' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branc
h
'tg/maint-c
a
che-name-compare' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
cache_na
m
e_
c
om
p
are()
:
do not
t
runcate w
h
ile comparin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
a
p
ply:
tests for the --3way optio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
filter-bran
c
h:
do n
o
t forget t
h
e '@' p
r
efix to
f
orce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse --disambiguate=<prefix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
rev-p
a
rse: A and B in "r
e
v-parse A
.
.
B
" refer to committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
rese
t
: the com
m
a
n
d
ta
k
es committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
H
ama
n
o
commit-tree: th
e
command wants
a tr
e
e and commits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --buil
d
-
f
a
ke-ancesto
r
expects bl
o
bs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: add
s
upport for
d
isambigua
t
ing oth
e
r ty
p
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev
i
sion
.
c:
the "log" family,
except for
"
sho
w
", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
r
e
vi
s
io
n
.
c: allow handle_revision_arg() to tak
e
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
sha1_name
.
c: introd
u
ce get_sha1_co
m
mittish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
sha1_name
.
c:
teach lookup
c
ontext to
g
et_sha1_with_context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
sha1_n
a
me
.
c: m
a
ny
s
hort names
can only be committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
ha1_name
.
c:
g
et_sha1_1()
tak
e
s
lo
o
k
up fl
a
gs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
sha1_na
m
e
.
c: get_descr
i
be
_
name(
)
by defi
n
ition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hamano
r
e
rer
e
: make rr
-
c
a
che fanout direct
o
r
y
h
o
n
o
r u
m
ask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: document --3way o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: all
o
w rerere() to work on --3w
a
y results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: register conflicted
s
t
a
ges to the
i
n
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Ham
a
no
apply: --3way with add/add co
n
flict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
apply: mov
e
verify
_
index_match()
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: plug the t
h
ree-
w
ay
m
e
rge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: fa
l
l back on three-
w
ay merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: accept -3/--3way command
l
i
ne o
p
t
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
a
pply: m
o
ve "
a
lready e
x
ists"
l
ogic
to che
c
k_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
a
p
p
ly
:
m
o
ve
c
h
e
ck
_
to_c
r
eate_b
l
ob(
)
close
r
to
its
s
ole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
furthe
r
split load_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: refactor
"
previou
s
patch"
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
app
l
y: spl
i
t load_preimage() h
e
lper fu
n
ction out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
ap
p
ly: f
a
ctor out checkout_target() help
e
r function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
H
a
man
o
apply: refactor read_file_or_git
l
ink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_ima
g
e
() clears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next