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/maint-mailinfo-mime-attr' into maint
2012-07-22
Junio C Hamano
Merg
e
branc
h
'pg/maint-1
.
7
.
9-am-where-is-patch'
commit
|
commitdiff
|
tree
2012-07-22
J
unio
C
Hamano
M
erge
bran
c
h 'j
l
/
m
aint-1
.
7
.
1
0
-recurse-submodules-w
i
th
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Me
r
ge branch 'ms/dae
m
on-doc-typo'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Merg
e
b
r
anch '
l
k
/mo
r
e-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C
H
am
a
no
M
er
g
e branch
'
j
c/s
h
a1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Merg
e
branch
'jc/m
a
in
t
-filter-
b
ranch-epoch-da
t
e'
commit
|
commitdiff
|
tree
2012-07-18
Jun
i
o C
Hamano
d
i
ff: correctly disable external
_
diff
w
i
th --no-ext
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-17
Junio C Hamano
Revert "git-c
o
mmit-
t
re
e
(1): update s
y
nopsis"
commit
|
commitdiff
|
tree
2012-07-17
Ju
n
io
C
Hamano
Merg
e
branch 'kk/main
t
-1
.
7
.
9-commit-tree
'
into kk/mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Junio
C Hamano
commit-tree: resurrect command line p
a
r
sing updates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Update draft release notes for 7th batch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hama
n
o
Merge branch 'tg/maint-
c
ache-
n
ame-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
M
e
rge br
a
nch 'jk/
i
ndex-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C H
a
mano
Merge b
r
a
nch 'jk/maint-com
m
it-amend-only-no-pa
t
hs'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Hamano
Me
r
g
e
branch 'cw/amend-commit
-
w
it
h
o
ut-me
s
sage'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ha
m
an
o
Merge branch 'j
n
/makefi
l
e-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Merge branc
h
'ar/
c
lone-h
o
nor-umask-
a
t-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Me
r
ge br
a
n
ch 'j
c
/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Ha
m
ano
Merge branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
b
ranch 'pw/git-p
4
-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Haman
o
Me
r
ge branch
'pw/git-p4-jobs
'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Haman
o
Merge branch 'jk/p
u
sh-delete-ref-error-mess
a
ge'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Sixth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
i
o C Hamano
Merge branch 'jc/ref
a
c
to
r
-diff-st
d
in'
commit
|
commitdiff
|
tree
2012-07-13
J
u
ni
o
C
Hamano
Merge branch '
t
g/ce-namel
e
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge branch 'tb/sanitize-deco
m
posed-u
t
f-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Merge branch 'mm/m
e
diawiki
-
tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Ham
a
no
Merge br
a
nc
h
'jn/
v
c
s
-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Mer
g
e branc
h
'mm/
m
ediawiki-file-attac
h
men
t
s
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge branch 'tr/maint-show-wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge
b
ranch 'mz/
r
eb
a
se-no-m
b
o
x
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
t1512: match the "other" ob
j
ect names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t700
3
: a
d
d test to filter
a branch
w
ith a commit at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
d
ate
.
c
:
Fix off b
y
one error in object-header date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
t
1512: ignor
e
whitespaces i
n
w
c -l output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hama
n
o
R
e
duce
draft release
n
otes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Haman
o
Sync
with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch 'jc/
m
aint-blame-un
i
que-abbrev' int
o
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch
'
rj/
p
latform-pread-
m
ay
-
be-th
r
ead-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge bran
c
h
'th/diff-no
-
ind
e
x
-
fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ham
a
no
Me
r
ge branch '
n
d/clone
-
single-fix' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
H
a
mano
Merge b
r
an
c
h
'jc/rev-list-simp
l
ify-me
r
ges-fir
s
t
-
parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Me
r
g
e bra
n
ch
'hv/submodule-upda
t
e-nuk
e
-subm
o
d
u
l
es'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge bra
n
ch
'
jk/dif
f
-
no-
i
ndex-pager'
i
nto
maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C Hama
n
o
Merg
e
branch 'mm/verify-filename-
f
ix' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Mer
g
e b
r
anch 'cn/
c
her
r
y-pick-range-do
c
s' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C H
a
mano
Merge branch 'j
c
/u
s
ta
r
-
checksum-is-unsigned' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/bun
d
le-co
m
plete-n
o
tice' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
g
e branch 'jc/ls-
f
iles-i-dir' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ha
m
a
n
o
Merg
e
bran
c
h 'jc/r
e
qu
e
st-pull-
m
a
t
ch-tagnam
e
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Hamano
Merge
b
ranch 'tg/maint-cache-na
m
e-co
m
pare' in
t
o
tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
io C Ha
m
ano
cache_name_compare(): do
n
ot truncate whil
e
comparing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C
Hamano
a
p
ply: tes
t
s for
the --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C Hamano
filter-branch
:
do not
forget
the
'
@' prefix to for
c
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-parse --disambi
g
uate=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rev-pars
e
: A and B
in "rev-parse A
.
.
B
" re
f
er to
c
ommittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
reset
:
the
c
ommand takes
committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C H
a
mano
commit-tree: t
h
e command
w
a
nts a tree
and
c
om
m
its
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Ha
m
ano
app
l
y: -
-
bui
l
d-fake-ancestor
expe
c
ts
blo
b
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_
n
a
m
e
.
c
: add support
f
or disambiguat
i
ng
o
t
h
er types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
revision
.
c: the "log" family, exce
p
t for
"
sho
w
", ta
k
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
revision
.
c
:
a
llow handle_revision_arg(
)
to take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
sha1_name
.
c:
i
ntroduce
g
et_sha1_committi
s
h()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
sha1_n
a
me
.
c: teach lookup
c
ontext
to
get_sha
1
_
with_context()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
s
h
a1_na
m
e
.
c:
m
any sh
o
rt names can only be
c
ommittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
h
a
1_nam
e
.
c: g
e
t_sha1_1() takes look
u
p fl
a
gs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
H
amano
sh
a
1_name
.
c
:
get_describe_name() by definition groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerere: m
a
k
e rr
-
cache fano
u
t
dire
c
tory honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: d
o
c
u
ment --3way op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: a
l
low rerere
(
) to
w
ork on --3way resu
l
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: r
e
gister
c
onfl
i
cted stages to the in
d
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
a
p
p
l
y: --3way with
add/add conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
a
p
ply: m
o
v
e
ver
i
fy_index_
m
at
c
h() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: plu
g
the thr
e
e-w
a
y merge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: fall back on
t
h
ree-way merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: accept -
3
/--3way command
line optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: move "already
e
xists"
logic to check_
t
o_crea
t
e(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
apply: mo
v
e che
c
k_
t
o_create
_
blob() clos
e
r
to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
app
l
y: furt
h
e
r
sp
l
it loa
d
_p
r
eimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
a
p
ply: ref
a
ctor "prev
i
ous
patch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
p
ply: split lo
a
d_pr
e
image() helper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: factor out
c
heck
o
ut_target() helper
f
unction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: refacto
r
read_file_or_
g
i
tlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
apply: clear_image() clea
r
s things a b
i
t more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
p
p
ly: a bit more com
m
en
t
s o
n
PATH_TO_BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C
H
a
mano
apply:
f
ix an
i
nc
o
mpl
e
te
comment
i
n
check_patc
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge
g
it://gith
u
b
.
com/git-l10n
/
git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
F
i
fth
batc
h
for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch '
c
w/help-
o
ver-networ
k
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merge branch 'mz/empty-
r
ebase-te
s
t'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merg
e
b
ranch 'pw/git-p4
-
tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge branch 'js/fa
s
t-expor
t
-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
n
o
Merge branch 'cw/no-detaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch 'vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Merge branc
h
'
mm/crede
n
t
i
a
l-plumbin
g
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
Merge
b
ran
c
h 'jc/main
t
-blame-un
i
que-abb
r
ev'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hamano
Merge branc
h
'jn/per
l
-makemaker
-
lead
i
n
g
-
paths
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
Merge branch
'rj/platform-pread-may-be-th
r
ead-
u
n
safe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branch 'mm/con
f
ig-x
d
g'
commit
|
commitdiff
|
tree
next