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
t7409: make sure submodule is initialized and updated in more detail
2012-07-09
J
u
nio C Hamano
sh
a
1_name
.
c:
t
each lookup context to get_sha1_with_cont
e
xt()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
sha
1
_name
.
c: many short names can only be c
o
mmittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C
H
aman
o
s
h
a
1_name
.
c: get_s
h
a1_1()
takes
lookup
f
lags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
a
no
sha
1
_name
.
c: get_describe_nam
e
()
by defi
n
ition
groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
rerere:
m
ake rr-ca
c
he f
a
nout directory honor umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: do
c
um
e
n
t --3way o
p
t
io
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
app
l
y: allow re
r
e
r
e()
t
o work on -
-
3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
r
egiste
r
conflicted stages to the inde
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y:
--3way
w
ith
a
d
d/add confli
c
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
an
o
appl
y
: move ver
i
fy_in
d
ex_m
a
tch() hi
g
h
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
apply: pl
u
g the three-way
m
erge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
ap
p
l
y: fall b
a
c
k on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hamano
appl
y
: accep
t
-3/--
3
w
a
y
comma
n
d li
n
e opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move
"already exists" logic to ch
e
ck_to_cre
a
te(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: move check_t
o
_create_blob
(
) closer to its so
l
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
apply: furthe
r
split l
o
a
d
_preimage(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ham
a
no
apply: refac
t
or "previous patch" lo
g
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
H
amano
apply:
s
plit load_preimage(
)
h
e
lper function
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: factor out
checkout_
t
arget() he
l
pe
r
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
ap
p
ly: refacto
r
read_file_o
r
_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: clear_image() clears things a b
i
t more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: a bit more comme
n
ts on PATH_TO_BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
apply: fix an incomplete c
o
m
m
ent in che
c
k_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merge git://github
.
com/git-
l
1
0
n/git-
p
o
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
a
mano
Fifth batch
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Haman
o
Merge
branch 'cw/help-over-n
e
twork'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
Me
r
g
e branch 'mz/empty-rebase-t
e
st'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merg
e
branch 'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'js/fas
t
-e
x
p
or
t
-paths-with-spac
e
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
Merge branch 'cw/no-detach
i
ng-
a
n-
u
nborn'
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
H
a
mano
Merge branch 'vr/use-our
-
perl-in-tests
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e
branch 'mm/credentia
l
-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
Merge
b
ran
c
h 'jc/maint-blame-uniqu
e
-a
b
brev'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merge branch
'jn/perl-makemaker-lea
d
ing-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branc
h
'rj/platform-pread-may-be-thread-uns
a
fe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
Me
r
ge branch 'm
m
/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ham
a
n
o
Fourth batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
amano
Merge b
r
anch
'
nd/clone-si
n
g
l
e-fix
'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
Me
r
ge branch 'th/diff
-
no-index-
f
i
xes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Ham
a
no
Merge
b
ra
n
ch 'hv/re
m
ote-end-hung-u
p
'
commit
|
commitdiff
|
tree
2012-07-03
J
uni
o
C
H
a
mano
sha1_
n
ame
.
c
:
teach
ge
t
_
s
hort
_
sha1(
)
a commi
t
-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_sha1() to take
o
ther flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
get_sh
a
1
(
): fix erro
r
status regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
un
i
o C Hamano
sha
1
_name
.
c
:
restructure
d
isambig
u
a
t
i
on of s
h
ort nam
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
sha1_name
.
c
:
correct m
i
s
n
amed "canonical" a
n
d "res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Haman
o
sha1_nam
e
.
c
:
refactor
find_
s
hort_p
a
cked_
o
b
ject()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C Hama
n
o
sha1_
n
ame
.
c: rename "now" to "cu
r
rent"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C Ha
m
an
o
sha1_name
.
c
:
c
larify w
h
at
"
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
H
amano
s
ha1_name
.
c:
get rid
o
f
g
et_sha1_with_mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
J
u
nio
C Haman
o
sha1_
n
am
e
.
c: get rid
of get_sha1_wi
t
h_mode
_
1()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Ju
n
io C Hamano
Sync wit
h
i18n-
p
o updates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Hamano
Merge
branch '
m
aint' of git://githu
b
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
J
u
n
i
o C Ha
m
ano
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
J
unio C Hamano
blame: c
o
mpu
t
e abbrevia
t
i
on
w
idt
h
that ensure
s
u
n
i
queness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
io
C
H
amano
diff-index
.
c: "gi
t
diff" has
n
o
need to read blob
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C
H
amano
d
i
ff-i
n
d
e
x
.
c: un
i
fy han
d
ling of
c
ommand
l
ine pat
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
d
iff-index
.
c: do not
pretend
p
ath
s
a
re pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Third batch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merge branch
'fc/git-pro
m
pt-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
H
a
m
ano
Merge bran
c
h 'js/subm
o
dule-relative'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Mer
g
e branch 'lk/
m
ore-helpful-status-hin
t
s'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
man
o
M
erge branch 'lk/
r
ebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merg
e
br
a
nch 'jc/
r
ev-
l
ist-simplify-
m
erges-first-p
a
r
e
nt'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Mer
g
e branch 'hv
/
submod
u
l
e-u
p
date
-
nuke-subm
o
dules'
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
io
C
Haman
o
Mer
g
e branch
'nd/exc
l
ude-
w
orkaround-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io
C
Ha
m
ano
Merge
b
ranch 'nd/
s
tream
-
p
ack-objec
t
s'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'nd/stream-index-pack'
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
i
o
C
Hamano
Me
r
ge branch 'mm/verify-file
n
am
e
-
f
i
x'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Ham
a
no
Merge branch 'jk/diff-no
-
i
ndex-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hamano
ind
e
x-pack: Di
s
able t
h
r
eadin
g
o
n c
y
g
win
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ham
a
n
o
Second batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C Hamano
M
e
rge branch '
l
p/no
-
cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch 'cn/cherry-pick-rang
e
-d
o
cs'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C
H
amano
M
erge bra
n
ch 'lm/git-blam
e
-
e
l'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
Merge branch
'rs/ipv6-
s
sh
-
url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
Mer
g
e branch 'jc/us
t
ar-checksum
-
is-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge
b
ranch 'rs/gi
t
-bla
m
e
-
mapcar-mapc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Mer
g
e branch 'rr/doc-commit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'nd/i
1
8n
-
misc'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Hamano
M
e
rge b
r
anch 'n
d
/
i
1
8n-branch
-
l
e
go'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
Merge
br
a
nch 'jk/no-m
o
re-asciidoc7'
commit
|
commitdiff
|
tree
2012-06-25
J
uni
o
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Haman
o
t
/
README
:
add a bit more Don'ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
tests: enclo
s
e $PERL_PATH in do
u
ble quote
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
t
/test-lib
.
sh: ex
p
ort
P
ERL_PATH for
u
se in s
c
ripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-22
Ju
n
io C H
a
m
an
o
M
e
rg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2012-06-22
Ju
n
io
C Hamano
Merge bran
c
h
'
v
r/
h
el
p
-per-
p
la
t
f
orm'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Sync with 1
.
7
.
1
1
.
1
commit
|
commitdiff
|
tree
2012-06-21
Ju
n
io C Haman
o
The firs
t
batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Git 1
.
7
.
1
1
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-21
Jun
i
o
C
Hamano
Merge branch 'jk/maint-t13
0
4
-s
e
tfacl'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Merge branch 'vr/help
-
per-platf
o
rm'
commit
|
commitdiff
|
tree
2012-06-21
J
u
n
io C Hamano
Me
r
ge br
a
nch 'jc/ls-
f
iles-i
-
dir'
commit
|
commitdiff
|
tree
2012-06-21
Jun
i
o C H
a
ma
n
o
Merge branch
'jk/ver
s
ion-stri
n
g'
commit
|
commitdiff
|
tree
2012-06-21
J
u
nio C Hamano
Merge bra
n
ch 'jc/
r
e
que
s
t-pull-m
a
t
ch
-
tagn
a
m
e'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Merge b
r
anch
'
jk/clone-local'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Ha
m
ano
Merg
e
branch 'jc/bundle-complet
e
-noti
c
e'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Kick off post 1
.
7
.
11
c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-19
Juni
o
C Hamano
show: fix "range implies walking"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-19
J
u
n
io C H
a
mano
git-
c
o
m
m
i
t-tree
(
1): update synopsi
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next