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 'dg/submodule-in-dismembered-working-tree'
2012-07-09
Jun
i
o C Hamano
re
s
et: the c
o
mmand tak
e
s c
o
mmittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
comm
i
t
-
tree:
t
he command wants
a
tree and com
m
i
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
ap
p
ly: --buil
d
-fak
e
-ances
t
or expects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
s
ha1_name
.
c: ad
d
support for
d
isambig
u
a
ting other types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
revis
i
on
.
c: the "log"
fami
l
y, except for
"
s
how
"
, tak
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
re
v
ision
.
c: allow handle_revisio
n
_a
r
g()
to take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
s
h
a
1
_
name
.
c
: introduce get_
s
h
a1_committish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
sha1_name
.
c
:
t
e
ach lookup context to get_sha
1
_with_context()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
sha
1
_n
a
me
.
c
:
m
any short names can only
be committish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
sha1_na
m
e
.
c:
g
et_sha1_
1
() t
a
kes lookup flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
s
ha1_name
.
c
:
get_describe_
n
ame()
b
y
d
efinit
i
on groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
rerere: make
r
r-ca
c
he fanout direc
t
o
ry honor u
m
ask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
apply: doc
u
ment --3way
o
ption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: allow rerere
(
) to wo
r
k
o
n --
3
wa
y
results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: register c
o
nflicted
s
tages t
o
the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply:
--3
w
ay with ad
d
/add co
n
flict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: mo
v
e
ver
i
fy_index_matc
h
() higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
a
no
a
pply
:
plug
t
he three-way merge logi
c
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply:
f
all
back
o
n three-way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply
:
accept -3
/
--3way command line option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
H
aman
o
apply: move "al
r
eady exists" lo
g
ic to check_t
o
_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
a
p
ply: move
check_to_cre
a
t
e
_blob() closer to its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply: furthe
r
sp
l
it load
_
p
reimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
pply: refactor "previous p
a
tch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: split load_preimage()
helper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C Hamano
apply: fac
t
or out
checko
u
t_
t
arget() helper
f
unctio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
appl
y
:
refactor re
a
d_file_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply: clear_image() clear
s
things a
b
it m
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
:
a bit more comments on
P
ATH_TO_
B
E_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
apply: fix an
incomp
l
et
e
c
omment in che
c
k
_
p
a
tch
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge git:/
/
github
.
c
o
m/git-l10
n
/
g
i
t
-
p
o
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
mano
Fif
t
h batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hama
n
o
Merge b
r
an
c
h 'cw/help-
o
v
er
-
ne
t
work'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge branch 'mz/empt
y
-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge branch
'
p
w/git-p4-test
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
b
r
a
nch 'js/
f
ast-expor
t
-paths-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
branch 'cw/no-detachi
n
g-
a
n-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
n
o
Me
r
ge branch 'v
r
/use-ou
r
-per
l
-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
Merg
e
b
ranch 'mm
/
credential
-
plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge branch 'j
c
/maint-blame-uniq
u
e
-
a
bbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge br
a
nch 'jn/
p
erl-makemaker-l
e
ading-paths
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Mer
g
e br
a
n
c
h 'rj/platform
-
pread-may-be-t
h
read-unsaf
e
'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
Merge bra
n
ch '
m
m/con
f
ig
-
x
d
g
'
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio C Ham
a
no
Fourth batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
J
u
n
io C Hamano
Me
r
g
e
branch 'nd/
c
lone-
s
ingle-fix
'
commit
|
commitdiff
|
tree
2012-07-05
J
u
n
io
C
Hamano
Merg
e
branch
'th/di
f
f-no-inde
x
-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C Ha
m
a
no
Merg
e
branc
h
'hv/remote-end-hung
-
up
'
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sha1_name
.
c: teach get_short_sha
1
()
a commit-
o
nly opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
s
h
a1_na
m
e
.
c
: allow
get_short_sha1
(
) to tak
e
o
t
her
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Ha
m
a
no
get_sha1
(
): fix error status
re
g
re
s
sion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Hamano
sha1_
n
a
me
.
c
: restructure disa
m
biguation of short
names
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_name
.
c:
c
orrect misnamed "ca
n
onical" an
d
"res
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Ham
a
no
sh
a
1
_
na
m
e
.
c: ref
a
ctor fi
n
d_short_packed_
o
bject()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1
_
na
m
e
.
c
:
r
ena
m
e
"
n
ow" to "current"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Hamano
sha1_name
.
c:
c
l
a
rify wh
a
t
"f
a
k
e
" is for in find_short_object
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o
C
Hamano
s
h
a1_
n
ame
.
c: get rid o
f
get_sha1_with_mo
d
e(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1
_
nam
e
.
c: get
rid
o
f get_sha1_with_m
o
de_1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
a
m
ano
Sync
with i
1
8n-po update
s
in maint
commit
|
commitdiff
|
tree
2012-07-02
Junio C Ha
m
ano
M
erge branch
'
m
a
int' o
f
git://g
i
thub
.
c
o
m
/git-l10n/gi
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
a
m
ano
sha1_n
a
me
.
c
:
hide
ge
t
_sha1_with_context_1() ugl
i
ness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Ham
a
no
b
lame: compute ab
b
reviation
width that ensures
un
i
queness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io
C
Ham
a
no
d
iff-index
.
c: "gi
t
diff"
has no
n
eed t
o
read
blob
from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Ham
a
no
diff-index
.
c: unify handling
of command line p
a
ths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C
H
amano
diff-
i
ndex
.
c: do n
o
t p
r
et
e
nd
p
aths
are
p
a
thspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio
C Hamano
Third batc
h
f
o
r 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Merg
e
b
ranch 'fc/git-prompt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
m
a
no
Merg
e
bran
c
h
'js/s
u
b
m
odule-relat
i
ve'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
Hamano
Me
r
ge branch 'lk/more-help
f
u
l-st
a
tus-hint
s
'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge branch 'lk/rebase-i
-
x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
Merge branch 'jc/rev-list-sim
p
lify-m
e
r
ges-
f
irst-parent'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merge
b
ra
n
ch 'hv/submodule-updat
e
-nuke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge branch 'nd/exclude-workaround-top
-
h
e
avy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
Merge
branch
'nd/stream-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C Hamano
Merge
br
a
nch
'
nd
/
stream-index-pack
'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Haman
o
Merge
branch
'mm/ver
i
fy-filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
aman
o
Merge branch 'jk/di
f
f-n
o
-in
d
ex-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Ham
a
no
index-
p
a
c
k: Disable t
h
r
e
a
ding
on
cy
g
win
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Ham
a
no
Second
b
atch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
io C Haman
o
Merge br
a
nc
h
'
lp/no-cm
d
-http
-
fetch'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C
H
amano
Merge branch 'cn/cherry-pick-range-docs'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
Merge branch 'lm/
g
it-blame-el
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge
branch
'
rs/
i
p
v
6-
s
s
h-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'j
c
/ust
a
r-c
h
ecks
u
m-is-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merg
e
br
a
nch
'r
s
/g
i
t-
b
lame-mapcar-mapc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch 'r
r
/doc
-
commit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merge branch 'nd/i1
8
n-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
M
e
rge branch '
n
d/i1
8
n
-branch-l
e
go'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
M
erge
branc
h
'
jk
/
no-mo
r
e
-
asc
i
idoc7'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Ha
m
a
no
test-lib: reorder and incl
u
de GIT-BUI
L
D-OPTIONS a
lot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Hamano
t/README:
add a bit more D
o
n't
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C H
a
m
a
no
te
s
ts:
e
n
cl
o
se $PERL_PATH in
d
ouble
q
uo
t
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
i
o
C
Hamano
t/test-lib
.
sh
:
ex
p
ort PERL
_
P
A
TH for
u
se in scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-22
Junio C Hamano
Mer
g
e branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2012-06-22
Junio
C
Hamano
Merge branch
'vr/he
l
p-per
-
pl
a
tform'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Sync w
i
th 1
.
7
.
11
.
1
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
T
h
e first batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-21
Junio C
Haman
o
G
i
t 1
.
7
.
1
1
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-21
Junio C Ham
a
no
Merge br
a
nch 'jk
/
ma
i
nt-t1304-setfacl'
commit
|
commitdiff
|
tree
2012-06-21
Juni
o
C Hamano
Merge branch 'v
r
/he
l
p-per-pla
t
form'
commit
|
commitdiff
|
tree
next