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
Junio
C Haman
o
Mer
g
e branch 'jc
/
ls-files-i-d
i
r' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio
C
H
a
m
a
no
Merge branc
h
'jc/request
-
pull-matc
h
-tagna
m
e' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge
b
ranch 'tg/mai
n
t
-
cache-name-com
p
ar
e
' int
o
t
g
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
cache_nam
e
_compa
r
e()
:
do not t
r
uncate while com
p
ar
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C
Hamano
apply: test
s
f
o
r the --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
u
nio C H
a
mano
f
ilter-branch: do no
t
f
orget th
e
'
@
' p
r
efix to force
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
rev-parse --disam
b
iguate=<
p
refix>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
rev-parse: A and
B in "rev-
p
arse A
.
.
B" refer to committ
i
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
reset: the comm
a
nd takes
comm
i
t
tish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o
C
Hama
n
o
comm
i
t-tree: the command wants a tree a
n
d
c
o
mmits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: --bu
i
ld-fake-ances
t
o
r
expec
t
s blobs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
m
a
no
s
h
a
1_na
m
e
.
c
:
a
dd s
u
pport for disambiguating other types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
a
mano
revision
.
c: the
"log" family, except for "sh
o
w", takes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revisi
o
n
.
c
: allow handl
e
_revision_arg(
)
to take other
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
sha1_name
.
c: in
t
roduce get_sha1_c
o
mm
i
ttish()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
sha1_na
m
e
.
c: te
a
ch
l
ookup context to g
e
t_sha1_w
i
th
_
context()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
sha
1
_name
.
c
: many short
n
ames can
o
n
l
y
be c
o
mmittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
sh
a
1
_
name
.
c:
g
e
t_sha1_1() takes lo
o
kup
f
l
ag
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Haman
o
sha
1
_nam
e
.
c: get_describe_
n
ame() b
y
definiti
o
n groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
man
o
rer
e
re: make rr-ca
c
he fanou
t
directory honor um
a
sk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
apply:
d
ocum
e
nt --3wa
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hama
n
o
apply: allow rerere()
t
o
work
on --3wa
y
results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
a
mano
apply: register co
n
flicte
d
stag
e
s
to the
i
ndex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: -
-
3w
a
y wi
t
h add/add confl
i
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: move verify_
i
ndex_match(
)
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug
t
he three-way mer
g
e logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: fall back on
t
h
re
e
-way me
r
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: accept -3/--3way co
m
ma
n
d
line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
H
a
mano
a
p
ply: move
"
already
e
xists" logic to check_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
a
p
ply: move check_to_creat
e
_bl
o
b
()
c
loser to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
Hamano
apply:
f
urther sp
l
i
t load_preim
a
g
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hama
n
o
apply:
r
efactor "previo
u
s
p
a
tch" lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split load_preimage() helpe
r
function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: fac
t
o
r out
c
hec
k
out_
t
arget() h
e
lp
e
r function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: refactor read_file_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: cl
e
ar_image() c
l
ears things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
apply: a bit more comments
on
PATH
_
TO_BE
_
D
ELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
m
a
n
o
a
p
ply: fix an
i
ncom
p
lete co
m
men
t
in check_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge gi
t
://github
.
com/g
i
t-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
Fifth ba
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
Merge bra
n
ch '
c
w
/
help
-
o
ver-n
e
t
wo
r
k
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch
'
mz/empty-r
e
b
a
se-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge branch 'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
M
e
rge branc
h
'js/fast-export-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
man
o
Merge b
r
anch 'c
w
/
n
o-d
e
taching-an-u
n
b
o
rn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge
branch 'vr/use
-
o
u
r-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
M
er
g
e branch 'mm/credential-pl
u
m
b
ing'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch 'jc/maint-bla
m
e
-
unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge bra
n
ch 'j
n
/perl
-
ma
k
emaker-
l
e
ading-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge br
a
nch 'rj/platform-pread-may-be-th
r
ead-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
a
mano
Merge branc
h
'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Fourth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
unio C
H
amano
Merge
bra
n
ch
'nd/clone-si
n
gle-fix'
commit
|
commitdiff
|
tree
2012-07-05
J
u
n
i
o C H
a
mano
Merge branch 'th
/
dif
f
-no-
i
ndex-fi
x
e
s
'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Ham
a
n
o
M
e
rge br
a
nch 'hv/remote-end-hung-
u
p'
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sha1_name
.
c: teac
h
get_sho
r
t_sha1() a com
m
it-onl
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o
C Hama
n
o
sha1_n
a
me
.
c: allow get_short_sha1() t
o
t
ake o
t
h
er flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hama
n
o
get_
s
ha1():
f
ix error status re
g
ressi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c: restr
u
cture disa
m
bigua
t
ion of shor
t
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
i
o C
H
am
a
no
sha1_name
.
c: c
o
rrect misnamed "canonical"
a
nd "res
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Hamano
s
ha1_name
.
c: refactor find_short_pack
e
d_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C H
a
mano
s
h
a1_na
m
e
.
c: rename "now" to "current
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio
C Hama
n
o
sha
1
_
n
a
me
.
c: clarif
y
what "fak
e
" is for in find_sho
r
t_obj
e
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C
H
amano
sh
a
1_name
.
c: get rid
o
f get_sha1
_
wi
t
h_mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
unio
C Ha
m
ano
sha1_nam
e
.
c: get
rid o
f
get
_
s
h
a1_with_mode_1
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C H
a
man
o
Syn
c
with i18n-po updates i
n
maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
ama
n
o
Merge
b
ranch '
m
aint' of git://github
.
com/git-l10n/gi
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
s
ha1_name
.
c: hide ge
t
_sha1_wi
t
h_context_1()
u
gliness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
amano
blame: compute a
b
breviation width
t
h
a
t ensures
un
i
quenes
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
dif
f
-index
.
c:
"
git diff"
h
as n
o
n
e
ed t
o
read bl
o
b from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
d
iff-index
.
c: unif
y
handli
n
g of
c
ommand line
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
i
o
C
H
amano
d
iff-in
d
ex
.
c: do not
pr
e
tend paths ar
e
pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Th
i
rd batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge
b
ran
c
h 'fc/g
i
t-p
r
ompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C H
a
mano
Merge branch
'js/s
u
b
m
odule-re
l
ati
v
e'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io
C
Hamano
Mer
g
e branch 'lk/more-helpful-sta
t
u
s
-hints'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hama
n
o
Merge
branch 'lk
/
rebas
e
-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
Mer
g
e bra
n
ch
'
j
c/rev-
l
i
s
t
-
s
i
mpl
i
fy-
m
erges-fir
s
t
-parent'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
i
o C Hamano
Merge branch 'hv/submodule-update-nuke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
a
no
M
erge
b
ranch
'
n
d
/
exclude-
w
orka
r
ou
n
d-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Merg
e
bran
c
h 'nd/stre
a
m-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'nd/stream-i
n
dex-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
ma
n
o
Merge branch 'mm/verify-filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
Merge bran
c
h
'jk/diff-n
o
-
i
n
dex-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Ham
a
n
o
inde
x
-pac
k
: Disable threadi
n
g o
n
cygw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
S
e
cond batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Haman
o
Merge bran
c
h 'lp/no-cmd-h
t
tp
-
fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch
'
cn/c
h
er
r
y-pick-ra
n
ge-docs'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C
H
a
m
ano
Merge bran
c
h 'lm/git-blame
-
el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
m
a
n
o
M
e
rg
e
bran
c
h '
r
s/ipv6-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge
b
ranch
'
jc/
u
star-ch
e
cksum-
i
s-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o
C
H
a
mano
M
erge branch 'rs/git-bl
a
me-mapcar-
m
apc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
M
e
rge branch 'r
r
/
d
oc-
c
ommit
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
m
a
no
Merge branch
'nd/i18n-m
i
sc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'nd/i18n-branch-
l
ego'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Merge branch
'jk/no-more-ascii
d
oc
7
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C
H
amano
test
-
lib: re
o
rder and
include GIT-B
U
ILD-O
P
TION
S
a lot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
io C Hamano
t/
R
EA
D
ME: add a bi
t
mo
r
e Don'ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
tests: enclose $PERL_PATH in do
u
ble quo
t
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next