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 'as/t4012-style-updates'
2012-07-22
Junio
C
Hamano
Merge branch 'as/t4012-style-updates'
commit
|
commitdiff
|
tree
2012-07-22
J
unio C Ha
m
a
no
M
e
rge branch 'p
g
/maint-1
.
7
.
9-am-where-i
s
-p
a
tch'
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge bra
n
c
h
'jl/main
t
-1
.
7
.
10-rec
u
rse-submodules-
w
ith
.
.
.
commit
|
commitdiff
|
tree
2012-07-22
Junio C Hamano
Merge branch
'
m
s
/daemo
n
-
d
oc-typo'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Haman
o
Me
r
ge br
a
nch '
l
k/mo
r
e-hel
p
ful-s
t
at
u
s-hints'
commit
|
commitdiff
|
tree
2012-07-22
Ju
n
io C Hamano
Merge
branch 'jc/sh
a
1-name-
m
o
r
e'
commit
|
commitdiff
|
tree
2012-07-22
Juni
o
C Ham
a
n
o
Merge bra
n
c
h
'jc/maint-filter-branch-epoch-dat
e
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
H
amano
Update dra
f
t
release n
o
tes for 7th
b
a
tch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
J
u
n
io C Hamano
Merge branch
'
tg/
m
aint-cache
-
name-compare'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C Hamano
Merge branch 'jk/index-
p
ack
-
streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
H
amano
Merge branch 'jk/maint-commit-amend-
o
nly-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
m
a
no
Merge b
r
anch 'cw/amend-
c
omm
i
t-wi
t
hout-me
s
sage'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Mer
g
e branch 'jn/
m
akefile
-
c
lean
u
p'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merg
e
branch 'ar/clone-hono
r
-
u
mask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
J
unio
C
Ha
m
ano
Me
r
ge branch 'jc/
a
pply-3w
a
y
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branc
h
'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Me
r
ge branch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
J
u
n
io C Hamano
Merg
e
bran
c
h
'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Ju
n
io C Hamano
M
e
rge branch 'jk/
p
us
h
-delete-ref-er
r
o
r
-message'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Sixth batch f
o
r
1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C H
a
mano
Me
r
ge
branch 'jc/refact
o
r-diff-std
i
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
a
n
o
Merge
b
ranch 'tg/c
e
-namelen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
erg
e
branc
h
'tb/sanitize
-
dec
o
mposed-utf-
8
-pathn
a
me'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Merge branch 'mm/mediawiki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
M
e
rge branch
'jn/vcs-
s
vn
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
io C Hama
n
o
Merge
b
ra
n
ch 'mm/mediawiki
-
file-attac
h
men
t
s'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C H
a
mano
M
e
r
g
e
branch 'tr/m
a
int
-
show-wa
l
k'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
b
ranch 'mz/rebase-no-mb
o
x'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
t151
2
: match
t
h
e "other"
o
b
ject names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio C Hamano
t7003: add
t
e
st
t
o
fil
t
e
r
a b
r
anch with a com
m
it at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
J
u
ni
o
C Ha
m
ano
da
t
e
.
c:
F
ix
o
ff by one error in object-header date
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
t1512: ignore whitespaces
in wc -l
o
utput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Reduc
e
d
raft release notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
ni
o
C H
a
mano
Sy
n
c with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o
C
Ham
a
no
M
e
rge bran
c
h
'
jc/
m
aint-blame-u
n
i
q
ue-abb
r
ev' in
t
o
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
M
erge
b
ranch 'rj/platform-pread-may-be-thread-
u
nsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branch
'
th/diff-no-index
-
fixes' i
n
t
o
m
ain
t
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
M
e
rge branch 'nd
/
clone-sing
l
e-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hama
n
o
Merge
b
ranc
h
'jc/
r
ev-l
i
st-simpl
i
fy-merg
e
s-
f
irst
-
parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C Hamano
M
e
rge branc
h
'h
v
/s
u
bmod
u
l
e
-update-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge branc
h
'j
k
/
d
iff-no-index
-
pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hama
n
o
M
erge bra
n
ch 'mm
/
veri
f
y-filename-fix
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Merge b
r
a
nch
'
c
n/cherry-
p
ick-range-d
o
cs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Ham
a
no
Merge branch 'j
c
/u
s
tar
-
checksum
-
i
s-unsigned' in
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'
j
c
/bundle
-
com
p
l
ete-n
o
tice
'
int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
branch 'jc/ls-
f
iles-i
-
dir' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o
C H
a
mano
Merge bra
n
ch
'
j
c/request-pul
l
-ma
t
c
h
-
tag
n
am
e
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o
C H
a
ma
n
o
cache_na
m
e_c
o
mpare():
d
o
no
t
truncat
e
while
c
omparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C Ha
m
ano
apply
:
t
ests for the
-
-3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio
C
Ha
m
ano
filter
-
b
r
a
nc
h
:
d
o not forg
e
t the
'
@' pref
i
x to fo
r
ce
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
rev-parse --disambiguate=
<
pref
i
x>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
r
e
v-
p
arse: A
a
nd B in "r
e
v-parse A
.
.
B" r
e
fer to commit
t
i
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
reset: the command ta
k
e
s
commi
t
tish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
commit-tree: the
com
m
a
nd wants a
t
ree and commi
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --bui
l
d-
f
a
ke-ances
t
o
r expects blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_n
a
me
.
c: add support for disambigua
t
ing o
t
h
e
r t
y
pes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
r
e
vision
.
c:
the
"
lo
g
" fa
m
ily, except
for "show",
takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
revision
.
c: all
o
w handle_re
v
i
s
ion_arg()
t
o take o
t
h
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
sha1_name
.
c
:
introdu
c
e get_s
h
a1_
c
ommittish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
sha1
_
n
am
e
.
c
:
tea
c
h look
u
p context
to get_sha1_wit
h
_context(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha1_name
.
c: many sh
o
r
t
names can on
l
y be commi
t
tish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
h
a1_nam
e
.
c: get_sha1_1() takes lookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1
_
name
.
c: get_desc
r
ibe_name()
b
y definition groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
re
r
ere: m
a
ke rr-ca
c
he fano
u
t directory hon
o
r
umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: docume
n
t
--
3
w
a
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
p
ply
:
allow rerere()
t
o work
o
n
--
3
way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: register c
o
nflicted st
a
ges to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
apply: --3
w
ay with add
/
add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
appl
y
: move v
e
rify
_
ind
e
x_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply
:
plug the three
-
way merg
e
logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply:
f
all
b
ack
on
three-way merg
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: ac
c
ept -
3
/
--3wa
y
command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: move
"
a
l
r
eady
exi
s
ts" logic to check_to_create(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o
C Ham
a
no
apply
:
mov
e
c
h
e
c
k_to_cr
e
ate_blob() closer to its
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
no
apply:
further split
load_prei
m
age()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
apply: refa
c
to
r
"prev
i
ous patch
"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: s
p
lit
l
o
a
d_prei
m
age() helper function
o
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: factor
out checkout_targe
t
() helpe
r
f
u
n
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Hamano
appl
y
: ref
a
ctor read_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply
:
clear_image() clears things a
bit m
o
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: a bit more c
o
mments on
PA
T
H_T
O
_BE_DELE
T
ED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
mano
ap
p
ly:
fix
an inco
m
plete
c
om
m
e
n
t in c
h
eck_patc
h
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Ha
m
ano
Merge git://githu
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Fift
h
batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge branch 'cw/help-over-networ
k
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
Merge
branch 'mz/em
p
ty-re
b
ase-
t
est
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
M
e
rge bran
c
h 'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
Merge branch 'js/f
a
st-export-paths-with-sp
a
ces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merg
e
branch '
c
w/no
-
detaching-an-
u
nborn'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
Merge branc
h
'
v
r/use-our-pe
r
l-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
Merge br
a
nch 'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge bra
n
ch '
j
c
/mai
n
t-
b
l
a
me-
u
n
ique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge br
a
nch 'jn/perl-makem
a
ker-leading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge b
r
anch '
r
j/platform-pre
a
d-may-be-thread-uns
a
fe'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
ma
n
o
Merge bran
c
h 'mm
/
config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Ha
m
ano
Fourth batch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
u
n
i
o
C Hamano
Merge bran
c
h
'nd
/
clone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio
C
H
amano
M
e
rge br
a
n
c
h 'th/diff-no-in
d
ex-fix
e
s
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Ham
a
n
o
Merge
b
ra
n
ch
'hv/remo
t
e-end-hung-up'
commit
|
commitdiff
|
tree
next