repo.or.cz
/
git
/
jnareb-git.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/sha1-name-more'
2012-07-22
Junio
C
H
amano
Merge
branch 'jc/sha1-name-more'
commit
|
commitdiff
|
tree
2012-07-22
Junio C
H
a
m
a
no
M
erge b
r
anch '
j
c/maint-
f
ilter-branch-epoch-date
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
U
p
date dr
a
f
t
rel
e
ase
notes for 7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o
C H
a
mano
Merge
b
r
anch 'tg
/
maint
-
c
a
c
he-name-comp
a
re'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
mano
Merge bra
n
c
h
'jk/in
d
e
x
-pack-s
t
reaming-fi
x
'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Ham
a
no
Mer
g
e bran
c
h 'jk/maint
-
commit-amend-only-no-
p
aths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'cw
/
amend
-
commit-wit
h
out-message'
commit
|
commitdiff
|
tree
2012-07-16
J
u
ni
o
C
Ham
a
no
Merge branch
'
jn/m
a
kefil
e
-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
ma
n
o
M
erge br
a
n
ch
'
ar/clone
-
honor
-
umask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Hamano
Me
r
ge
branc
h
'jc/ap
p
ly-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge b
r
anch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
J
u
nio C H
a
mano
Merge bran
c
h 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C H
a
mano
Merge branch 'pw
/
git-
p
4
-job
s
'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o
C
Ham
a
no
M
e
r
g
e branch 'jk/push-delete-ref-error-mess
a
ge
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Ha
m
ano
Sixth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
J
unio C Hamano
Merge br
a
n
c
h 'jc/refactor
-
diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
m
an
o
Merge branch 'tg/ce-namele
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
M
e
rge branch
'
tb/sanitize-d
e
composed-utf-8-path
n
ame'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge
b
r
a
nch 'mm
/
mediawiki-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io
C
Hamano
Merge branc
h
'jn
/
vcs-s
v
n
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Ham
a
no
Merge
bra
n
ch
'
mm/me
d
iawiki-file-atta
c
hm
e
nts'
commit
|
commitdiff
|
tree
2012-07-13
J
u
ni
o
C
Ham
a
no
Merge
b
ranch 'tr/m
a
int-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
M
erge branch
'
m
z/rebase-n
o
-
mbox'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
t1512: match the "other
"
objec
t
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Ju
n
io C H
a
mano
t7003: add test
t
o filter a b
r
anch with a commit at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-12
Junio
C
Hamano
date
.
c:
F
ix
off by on
e
e
rror i
n
object-heade
r
dat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
t1512: ignore white
s
paces in
wc -l output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Reduce draft release notes to
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Sync 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
Junio
C
Hamano
Merge branch 'jc/maint-blame-u
n
iq
u
e-
a
b
b
rev' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
Hama
n
o
Merge branch 'rj/
p
lat
f
or
m
-
pre
a
d
-
m
ay
-
be-thr
e
ad-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge branch
'th/diff-n
o
-index-fixe
s
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Me
r
ge branch
'n
d
/clone-singl
e
-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Hamano
Mer
g
e
bran
c
h
'jc/rev-
l
is
t
-simplify-merges
-
f
i
rst-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge bra
n
ch 'hv/s
u
b
m
odul
e
-u
p
date-nuk
e
-
s
ubmodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o C
H
amano
Merge branch 'jk/diff-no-ind
e
x-pager' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Merge b
r
anch 'mm/verify-filename-fi
x
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'cn/cherry-pic
k
-range-docs' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge bran
c
h
'
jc/us
t
ar-
c
h
e
cksum-
i
s-
u
nsigned' into m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge b
r
anch 'jc/bun
d
l
e
-c
o
mple
t
e-notice' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Mer
g
e
branch 'jc
/
ls-files-i-dir'
into
maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
n
i
o C
Hama
n
o
M
e
r
ge bra
n
ch '
j
c/
r
equest-pull-m
a
t
c
h-tagname' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
cache_
n
ame_compare(): do no
t
truncate
while
comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hamano
a
ppl
y
: tests fo
r
the --3way op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
fi
l
te
r
-branch: do not forget th
e
'@' prefix
to
f
or
c
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Hamano
rev-par
s
e --dis
a
mbigua
t
e=<prefi
x
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
rev-parse: A and B
i
n "r
e
v-parse A
.
.
B" refe
r
to co
m
m
ittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
reset: the command
takes committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
commit-tree:
the com
m
and wants a tree and comm
i
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: --bu
i
ld-fake-ancestor expec
t
s blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
sha1_name
.
c
:
a
dd support for di
s
a
m
biguating
o
ther
t
ypes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
revisi
o
n
.
c: the "log" family, ex
c
e
p
t fo
r
"show", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
r
evision
.
c: all
o
w handle_
r
evision
_
arg() to t
a
k
e
other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
sha1_name
.
c
:
i
ntroduce get_s
h
a
1_com
m
ittish(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
sha1_name
.
c:
t
ea
c
h look
u
p cont
e
xt to get_sha1_with_cont
e
xt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
h
a1_name
.
c:
m
a
n
y short names can
o
nly be
committish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
ha1_
n
ame
.
c: get
_
sha1_1
(
) takes l
o
ok
u
p
flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_d
e
s
c
ribe_name
(
)
by defi
n
itio
n
groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
rerere: make rr-cache fanout directory h
o
nor um
a
sk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hamano
a
p
ply: docu
m
ent --3
w
ay option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
a
p
p
ly: allow re
r
e
r
e() to work
o
n --3way resu
l
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
apply:
regis
t
er c
o
nflicted stages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --3way with add/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: mov
e
verify
_
ind
e
x_mat
c
h() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: plug the three-way mer
g
e logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: fall ba
c
k
o
n
three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
a
n
o
app
l
y
:
acc
e
pt
-3/--3way command line op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
apply
:
m
o
v
e
"a
l
ready
exist
s
" logic to check_to_c
r
eate
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
apply: move che
c
k_to_crea
t
e_blo
b
() cl
o
ser t
o
its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: further
s
plit
l
oad_p
r
eimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
appl
y
: refacto
r
"previous pat
c
h
" l
o
gi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split load_preimage(
)
helper func
t
ion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
n
o
apply: facto
r
out checkout_target() h
e
lper functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
refac
t
or read_file
_
or_gitl
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
apply:
c
l
e
ar_i
m
age() clears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply:
a
b
it
more
comments on PATH_TO_BE_D
E
LETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
apply: fix
an
incomple
t
e
c
omment
i
n check_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://g
i
thub
.
com/git-l10n/git-
p
o
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
n
o
F
ifth bat
c
h
for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Mer
g
e
b
ranch
'cw/help-over-ne
t
work'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hama
n
o
Mer
g
e bran
c
h 'mz/e
m
pty-rebase-
t
e
s
t
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
Hamano
Merge branc
h
'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C Ham
a
n
o
Merge branch 'js/fast-export-path
s
-
w
ith-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
M
er
g
e
branch 'c
w
/no-d
e
ta
c
hing-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branc
h
'vr/use
-
our-perl
-
in-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
ama
n
o
Merg
e
b
ra
n
ch 'mm/creden
t
ial-p
l
umbing'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
M
e
rge
b
ranch 'jc/maint-blame-un
i
q
ue-
a
bbrev'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
Merge branc
h
'jn
/
p
e
rl-makemake
r
-leading-paths
'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Me
r
ge
b
ranc
h
'rj/platform-
p
read-may-b
e
-threa
d
-unsaf
e
'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
M
e
rg
e
br
a
n
c
h 'mm/
c
onfi
g
-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C
H
aman
o
Fourth
b
atch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
unio C Hamano
Merge branch 'nd/clone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
ano
Merge
branch 'th/diff-no-index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch 'hv/remote-end-h
u
ng
-
up
'
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io
C
H
a
mano
sha1_name
.
c:
t
e
a
ch g
e
t_short_sha
1
() a commit-
o
nly option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1
_
name
.
c
: al
l
ow
get_short_sha1()
t
o
take other flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
get_sha1()
:
fix error status reg
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
a
n
o
sha1_name
.
c: rest
r
uctu
r
e dis
a
mbiguation of short n
a
m
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C
Ham
a
no
sha1_name
.
c
:
correct
misnamed "canon
i
cal" and "res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next