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
Start preparing for 1.7.12.1
2012-07-24
Junio C Hamano
Merge bra
n
ch 'nk/
m
ain
t
-gi
t
we
b
-
l
o
g-by-lines'
commit
|
commitdiff
|
tree
2012-07-23
Jun
i
o C Hamano
mergetool: support --tool-help opti
o
n l
i
ke difftool
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Update draft
r
e
lease notes to
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Ham
a
no
Syn
c
with 1
.
7
.
11
.
3
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Hamano
Git 1
.
7
.
11
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C
H
a
m
ano
Me
r
ge branch
'
jk/p
u
s
h
-
delet
e
-ref-error-messa
g
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hama
n
o
Mer
g
e branch 'ar
/
c
l
one-honor
-
umas
k
-at-t
o
p' into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
H
a
mano
Merge branch 'c
w
/am
e
nd-commit-wi
t
hout
-
message'
int
o
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
unio
C
Hamano
Merge branch '
j
k/main
t
-
com
m
it-amend-only-
n
o
-
paths'
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io
C
Hamano
Merge branch
'
tg/maint-cache-na
m
e-compare'
into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Ha
m
ano
Merge branch 'tr/maint-show
-
walk'
into maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
aman
o
Merge
branch 'j
c
/r
e
factor-diff-
s
tdin' in
t
o maint
commit
|
commitdiff
|
tree
2012-07-22
Junio C Haman
o
Merge
b
r
a
nch
'
mz
/
empty-rebas
e
-tes
t
' into main
t
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hama
n
o
Mer
g
e br
a
n
ch 'js/
f
ast-expo
r
t-p
a
t
h
s
-
wit
h
-spac
e
s' into
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Ha
m
ano
Merge bra
n
ch 'cw/
n
o
-
detaching-an-
u
nborn' into
m
a
int
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch 'vr
/
u
se-our-p
e
rl
-
i
n-tests' into maint
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io
C
H
a
man
o
Merge git://bogomips
.
org
/
g
it-svn
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Mer
g
e branc
h
'jk/
r
e
v
i
sion-walk
-
stop-at-ma
x
-count'
commit
|
commitdiff
|
tree
2012-07-22
Jun
i
o
C Hamano
Merge branch
'
mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge
branch
'as
/
t4012-style-updates
'
commit
|
commitdiff
|
tree
2012-07-22
J
u
nio C Hamano
Merge branch
'pg/ma
i
nt-1
.
7
.
9-
a
m-where-
i
s-pat
c
h'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
amano
Me
r
ge branch 'jl/main
t
-1
.
7
.
10-recurse-
s
ubmodules-with
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Hamano
M
erge
b
ranch 'm
s
/dae
m
on-doc-
t
ypo'
commit
|
commitdiff
|
tree
2012-07-22
Junio
C
Ha
m
ano
Merge branch
'
lk/more-helpful-s
t
atus-hints'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
M
erge
bra
n
ch '
j
c
/
s
h
a1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Junio C H
a
mano
Merge b
r
a
n
c
h
'jc/maint-filter-bra
n
ch
-
e
po
c
h
-da
t
e
'
commit
|
commitdiff
|
tree
2012-07-18
Junio
C Hamano
diff: correctly disable ext
e
rnal_
d
i
ff with --no
-
ext
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-17
Junio
C Hama
n
o
Revert
"git-co
m
mit-tree(1): up
d
ate synopsis"
commit
|
commitdiff
|
tree
2012-07-17
J
u
nio C Hamano
M
e
rge branch 'kk/m
a
int-1
.
7
.
9-commit-tree' in
t
o
kk/maint
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Junio
C Ham
a
no
co
m
mit-tree: res
u
r
rec
t
c
o
mmand li
n
e
pars
i
ng updates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hama
n
o
U
pdate
d
r
aft release
n
otes
for 7th batc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
Ha
m
ano
M
erge br
a
nch 'tg/maint-cache-name-compar
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
H
amano
Merge
b
ranch 'jk/
i
ndex-pack
-
streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Merg
e
branch
'
jk/ma
i
nt-c
o
mmit
-
amend-only-no-paths
'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Merg
e
br
a
nch 'c
w
/amend-comm
i
t-wi
t
hout
-
message
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
branch 'j
n
/make
f
i
le
-
cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Ha
m
ano
M
e
r
ge bra
n
c
h 'ar/clone
-
h
o
nor-umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hama
n
o
Me
r
ge branch 'jc/app
l
y-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
ma
n
o
M
erge bra
n
c
h
'cw/rebase-
i
-r
o
ot'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Me
r
ge branch 'pw/
g
it-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge branch 'pw/git-
p
4-
j
obs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hama
n
o
M
e
rge br
a
nch 'jk/push
-
d
e
let
e
-ref
-
e
r
ror-
m
essage'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
a
n
o
Sixth
b
atch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Merge branch
'jc/refacto
r
-diff-std
i
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
er
g
e b
r
an
c
h
'
t
g/ce
-
namelen'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
H
amano
M
e
r
g
e
branch '
t
b/saniti
z
e-decomposed-u
t
f-8-path
n
ame'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Merge
branc
h
'mm/
m
edia
w
ik
i
-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merge branch 'jn/vcs-sv
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ham
a
no
Mer
g
e branch 'mm/mediawi
k
i
-
file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Me
r
g
e b
r
anch
'
t
r
/maint
-
show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merg
e
b
ranc
h
'mz/reb
a
se-no
-
mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
t1
5
12: match
th
e
"othe
r
" obj
e
c
t names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Junio C
Hamano
t7003: a
d
d test to f
i
l
t
er a branch wit
h
a
comm
i
t
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
io
C
H
aman
o
date
.
c:
F
i
x
off by
o
ne error in object-
h
eader date
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Ha
m
ano
t151
2
: ig
n
ore whi
t
espaces in wc -l out
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Redu
c
e
d
raft re
l
ease
notes to 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Ha
m
ano
S
ync
w
ith 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Git 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'jc/main
t
-blame-unique-abbrev' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
n
o
Merge b
r
anch 'rj/platfor
m
-pread-may-
b
e-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
ano
Merge branch 'th/diff-no-index-fi
x
es' int
o
main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Mer
g
e
b
r
anch
'nd/clone-single-f
i
x'
in
t
o
m
ain
t
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Merge
b
ranch
'
jc/
r
ev-l
i
s
t
-simplify-mer
g
es-first-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C Hamano
Merg
e
branch 'hv/submodule-update-nuk
e
-subm
o
dul
e
s'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge branch 'j
k
/d
i
f
f
-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C Hamano
Merge
b
r
anch 'mm/v
e
rify-filename-fix' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hama
n
o
Merg
e
branch 'c
n
/cherry
-
p
ick-range-d
o
cs
'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge branch 'jc/usta
r
-checksum-is-u
n
signe
d
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Me
r
ge branch 'jc/b
u
ndle-complet
e
-not
i
ce'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Ha
m
an
o
Merge branch
'
jc/l
s
-
f
iles-i-
d
i
r
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C Hamano
Merge
branch 'jc/request-pull
-
mat
c
h-tagname' into ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch
'tg/m
a
i
n
t
-ca
c
he-name
-
compare' into tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
cache
_
n
ame_compare(): do not truncate
while comparin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: tests for th
e
--3way
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
f
ilter-branc
h
: do not forget
the
'@'
prefix to
force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
rev-par
s
e --dis
a
mbiguate=<pref
i
x>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
rev
-
p
arse: A and B in "rev-par
s
e A
.
.
B" ref
e
r to comm
i
tt
i
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
reset: t
h
e co
m
man
d
takes
c
ommitt
i
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
c
o
mmit-tree: the co
m
mand
wants a tree a
n
d comm
i
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
apply: --
b
uild
-
fake-ance
s
tor ex
p
ects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
sha1_name
.
c:
a
d
d
support for disambiguating other types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
revision
.
c: t
h
e "
l
og"
family, exc
e
pt
f
or
"
show",
takes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
revi
s
ion
.
c: allow handl
e
_rev
i
sion_arg
(
) to take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
sha1_name
.
c: intro
d
uce get
_
sha1_
c
om
m
itt
i
sh
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
m
ano
sha1_name
.
c: teach loo
k
up co
n
te
x
t to get
_
s
h
a1_with_context
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
s
h
a
1_
n
ame
.
c:
many short names ca
n
only
b
e
commit
t
ish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
ha1_name
.
c
: g
e
t_sha
1
_1()
take
s
lookup flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
s
h
a1
_
name
.
c: ge
t
_describ
e
_n
a
me() by def
i
nition groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Ha
m
ano
rerer
e
: make rr-cache fano
u
t
directory h
o
nor uma
s
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
apply: doc
u
me
n
t --3way
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply:
a
llow rerere(
)
to work o
n
--
3
way
res
u
l
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply: reg
i
ster conflicted stages t
o
the
index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply:
-
-3way wi
t
h add/
a
dd confl
i
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: mov
e
verify_index_match
(
) higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
H
amano
apply: plug th
e
t
hree-
w
ay merge logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: fall back on
t
hree-w
a
y merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply
:
a
ccept -3/--
3
way com
m
and li
n
e opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: m
o
ve "alre
a
dy exist
s
"
logic to check_to_cr
e
ate()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: move
check_to_create_blo
b
(
)
closer to i
t
s
sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply:
fur
t
her s
p
l
it load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next