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 'hv/link-alt-odb-entry'
2012-07-11
Jun
i
o C Hamano
Merge branch 'jc/ls-files-i-dir' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
M
e
rge branch 'jc/request-pull-match-tagnam
e
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Haman
o
M
erge branch 'tg
/
maint-cache-n
a
me-compare'
in
t
o tg
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
c
a
che_na
m
e
_co
m
pare(): do not t
r
unc
a
t
e
whi
l
e co
m
par
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
H
a
mano
apply: tes
t
s for the --
3
way opti
o
n
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 force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
r
ev-parse --disam
b
i
g
uate=<prefi
x
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
rev-p
a
rse: A
a
nd B in "r
e
v-
p
arse A
.
.
B"
r
efe
r
to comm
i
ttis
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
res
e
t: the co
m
mand ta
k
es comm
i
ttish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
commit-tree: the command
wants a
t
ree
a
nd c
o
m
m
its
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
apply: --
b
uild-fake-ancestor expects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hama
n
o
sha
1
_name
.
c
:
add support for di
s
ambiguating
other types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
evis
i
o
n
.
c: the "lo
g
" fa
m
i
ly
,
excep
t
for "sh
o
w", t
a
kes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
revision
.
c:
a
llow han
d
le_revi
s
ion_a
r
g(
)
t
o
take
o
ther
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
sha1_name
.
c
:
i
ntroduce get_sha1_committish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
sha1_name
.
c: tea
c
h
lo
o
kup context to get_sha1_with_con
t
e
x
t
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sh
a
1_name
.
c: man
y
s
h
ort n
a
mes can on
l
y be c
o
mmi
t
t
i
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
a
m
ano
sha1
_
n
ame
.
c
:
get_sh
a
1_1()
t
a
k
es lookup
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
sh
a
1
_
name
.
c: ge
t
_describe_nam
e
() by defin
i
tion
g
roks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
r
e
r
ere: make rr-cache fanout directory hono
r
umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply
:
documen
t
--3way op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: allow r
e
rere() to
wo
r
k
on -
-
3
w
a
y
r
e
s
ults
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
apply: register
c
onflict
e
d
stages to th
e
index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
app
l
y: --3wa
y
wi
t
h add/add
c
onflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
ano
appl
y
: move ver
i
fy_index_mat
c
h() h
i
g
h
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C H
a
mano
ap
p
ly: plug the thre
e
-way me
r
ge logic
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fall back
o
n thr
e
e-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: accept -3/--3w
a
y command line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: move "
a
l
ready
exists" logic to
c
h
ec
k
_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
p
ply: move ch
e
c
k_to_c
r
eate_blob() closer to i
t
s sol
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
apply: furth
e
r split load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
app
l
y: refactor
"
p
r
evious patch" log
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
no
apply: spli
t
load_preimage
(
) helper function
o
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hamano
apply:
factor ou
t
checkout_ta
r
get() helpe
r
funct
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply:
r
efact
o
r
read_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C Hamano
apply: clear_ima
g
e() clears things a
b
it more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: a bit more
c
ommen
t
s
o
n PATH_TO_BE_DE
L
ET
E
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
fi
x
an incomplete comme
n
t i
n
check_pa
t
ch
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Me
r
ge git://github
.
com/git-
l
10n/
g
it-p
o
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
F
ifth batch fo
r
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge
branch 'cw
/
h
e
lp-over-net
w
ork'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Haman
o
Merge branch 'mz/empty-
r
ebase
-
test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge br
a
n
c
h 'pw/git-
p
4-tes
t
s'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
Merge branch 'js/fast
-
exp
o
rt
-
p
aths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bran
c
h
'
cw/no-detaching-an-u
n
born'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
Merge branch 'vr/use-our-perl-in-
t
es
t
s'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
a
no
Merge
b
ranch 'mm/cr
e
d
e
n
t
i
al-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
M
e
rge branch
'
j
c
/
m
aint-
b
lam
e
-unique-ab
b
rev'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
Merge
b
ran
c
h 'jn
/
perl-makemaker-
l
eading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
M
erge branch '
r
j/
p
l
atform-
p
rea
d
-
may-be
-
thread-
u
nsaf
e
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'm
m
/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io C Ham
a
no
Fourth
batch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C H
a
mano
Merge
branch 'nd/clone-single-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branc
h
't
h
/
diff-
n
o
-
index
-
fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge bra
n
ch
'
hv/
r
emot
e
-end-hung-
u
p'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ha
m
ano
s
h
a
1
_n
a
me
.
c: teach get
_
short_sha1() a
co
m
mit-only option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Hamano
sha1_name
.
c: allow get_short_s
h
a1() to t
a
ke other fla
g
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
get_sha1(): fix e
r
ror status regress
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: restru
c
tur
e
dis
a
mbiguati
o
n of s
h
ort
n
a
mes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hama
n
o
s
ha
1
_name
.
c: correct
misnamed "canon
i
cal" and "res"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
Hamano
sha1_name
.
c: ref
a
c
t
or find_short_pa
c
ked_object()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio C Ha
m
a
no
sh
a
1_
n
ame
.
c:
re
n
am
e
"now" to "current"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
H
aman
o
sha1_name
.
c: clarify
what "fake" is for in find_short
_
o
b
ject
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: get ri
d
of get
_
sha1_wit
h
_m
o
de()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: get r
i
d of
get_sha
1
_with_mode_1
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Haman
o
S
y
n
c
with
i1
8
n-po
u
pdates in
ma
i
nt
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Mer
g
e branch 'main
t
' of git://githu
b
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
sha1
_
name
.
c: hide get_sha1_with_context_1()
ugliness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
blame
:
c
o
mpute abbreviation width
t
hat ensures
uniqu
e
ness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
diff-in
d
ex
.
c: "git diff" has no need to read
blo
b
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
diff-
i
ndex
.
c
:
unify handlin
g
of command line paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
diff-i
n
dex
.
c: do not
p
ret
e
nd
p
aths ar
e
pa
t
hsp
e
cs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Third batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
Hamano
Merge bran
c
h 'fc/git
-
prompt-sc
r
ipt'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Ham
a
no
Merge
b
ran
c
h
'js/submodule
-
relative'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Ha
m
ano
M
erge bran
c
h
'
l
k/mor
e
-helpful-
s
tatus-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Merge bra
n
ch 'l
k
/
rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C
H
amano
Merg
e
br
a
nc
h
'j
c
/rev-list-simplify-merges-fir
s
t-paren
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
e
rge branch 'hv/submodule-update-nuk
e
-
s
ubmodules'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
H
a
mano
Merge b
r
anch 'nd/
e
x
c
lude-wo
r
karo
u
n
d-top-heav
y
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Merge branch 'nd/str
e
am-pac
k
-
o
bj
e
c
t
s
'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hama
n
o
Me
r
ge br
a
nch 'nd/stream-
i
ndex-pack'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge branch 'mm
/
verify-fil
e
n
ame-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merge
b
ra
n
ch 'jk/diff-no-inde
x
-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio
C
H
amano
index
-
pack: Disable threadi
n
g on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio
C
Hamano
Se
c
ond batch for
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'lp/no-cmd-http-fetch
'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Ham
a
no
Merge bran
c
h 'c
n
/cherry-pick-r
a
nge-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merge br
a
nch
'lm/g
i
t-blame-el'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C
Hamano
M
e
rge
b
ranch 'rs/ip
v
6-s
s
h-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Merge branch 'jc/
u
st
a
r-checksum-is
-
un
s
igned'
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Hamano
Merge
br
a
nch
'rs/git
-
blame
-
mapcar-m
a
pc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch 'rr/doc-com
m
i
t'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
M
e
rg
e
branch 'nd/i18n-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'nd/i18
n
-
b
r
a
nch-lego'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
Merge
b
ranch 'jk/no-more
-
a
sciid
o
c7
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
M
e
rg
e
branch
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
test-lib: reorder and i
n
clude GIT-BUILD-OPTI
O
N
S a lot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
io C H
a
m
a
no
t
/
README: add a bit more Do
n
't
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C
Ham
a
no
tests
:
enclose $
P
E
RL_P
A
TH in double quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next