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 git://git.bogomips.org/git-svn
2012-07-11
Junio C Ha
m
ano
cache_n
a
me_
c
ompare(): do n
o
t
t
runcate while
c
ompar
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
J
unio C Hamano
apply: tests f
o
r t
h
e --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-10
Jun
i
o C Hamano
fil
t
e
r
-branch: do
n
ot forget the '@' prefix to force
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
rev-parse
-
-disambigua
t
e=<prefix>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C H
a
m
a
no
rev-pa
r
se
:
A and B
i
n
"rev-pa
r
se A
.
.
B" refer to com
m
ittish
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
man
o
reset: the
comm
a
nd takes c
o
m
mittis
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
commit-tree: the command wants a t
r
ee and commits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
mano
apply
:
-
-
build-f
a
ke-an
c
e
s
tor
e
xpects blobs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
s
h
a1_name
.
c: add support for disambigua
t
in
g
o
ther types
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
revi
s
ion
.
c: the "log" family, e
x
c
ep
t
for "show",
t
ake
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
revision
.
c: allo
w
handle_revi
s
io
n
_arg() to take other
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1
_
n
ame
.
c
: introduce get_s
h
a1_comm
i
ttish()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c:
teach look
u
p
co
n
t
e
xt t
o
get_sha1_
w
ith_
c
onte
x
t
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
s
h
a1_n
a
m
e
.
c:
man
y
short names can only be commi
t
t
i
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
an
o
sha1
_
name
.
c: get_sha1_1(
)
takes lookup
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
s
ha1_nam
e
.
c
:
g
et_
d
escr
i
be_name() b
y
d
efinition grok
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Hamano
rer
e
re
:
ma
k
e r
r
-cach
e
fanout directory honor umas
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: docu
m
e
nt --
3
way
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: all
o
w rerere() to work on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
a
no
apply:
r
egister conflicted
s
tages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Haman
o
apply: --3way with ad
d
/
a
d
d
c
o
nfl
i
c
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
pply: move veri
f
y
_
index_match
(
) higher
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
apply: pl
u
g t
h
e th
r
ee-way mer
g
e logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
appl
y
: fall back
on
three-way
m
erge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C
Haman
o
apply: accept -3/--3w
a
y command li
n
e option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: move
"already exis
t
s" lo
g
ic t
o
check_t
o
_creat
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
a
pply: move check_to_create_blob()
c
l
o
s
er
t
o its sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
a
pply: further split load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hamano
apply: refactor "previous patch" logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
p
ply: split load_preima
g
e
() helper function
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply: facto
r
out checkout_t
a
r
get() h
e
lper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
appl
y
:
refac
t
o
r
read_fi
l
e_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
a
p
ply: clear_
i
mage() c
l
ears thin
g
s a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: a bit more
comments on PATH_
T
O_BE_DELETED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
fix an incomplet
e
comment in
c
heck
_
patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
M
e
r
ge gi
t
:
//git
h
ub
.
com/git-l1
0
n/gi
t
-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Fifth bat
c
h for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
a
no
Merge
bra
n
ch 'cw/help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
man
o
Merge bra
n
ch '
m
z/empty-r
e
base-test'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
Merge bra
n
ch
'p
w
/git-p4-
t
ests'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
Mer
g
e branch '
j
s/fast-export-paths
-
with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
M
e
rge br
a
nch 'cw
/
no-detaching-
a
n-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge bran
c
h
'vr
/
use
-
our-pe
r
l-in-
t
ests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Merge bra
n
ch
'mm
/
cr
e
de
n
tial-pl
u
mbin
g
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Mer
g
e
b
ran
c
h
'jc/maint
-
blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'jn/p
e
r
l-makemaker-
l
eading-p
a
th
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
b
ranc
h
'rj/pla
t
for
m
-p
r
ead-may-be-t
h
r
ead-uns
a
fe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
M
er
g
e
branch 'mm/c
o
nfig-
x
dg'
commit
|
commitdiff
|
tree
2012-07-05
J
un
i
o
C
Hama
n
o
Fourth batch fo
r
1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Ju
n
io
C
Hamano
Merg
e
branc
h
'n
d
/clone-single
-
f
i
x
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
M
erge
bra
n
ch 'th/diff
-
no-index-fix
e
s'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Mer
g
e branch 'hv/remo
t
e-end
-
hung-up'
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Hamano
sh
a
1_nam
e
.
c: teach get_sh
o
rt_sha1() a commi
t
-only option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C Hamano
sh
a
1
_name
.
c:
a
ll
o
w get_short_sha1() to t
a
ke other flag
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
get_sh
a
1(): fi
x
e
rror stat
u
s regress
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Haman
o
sha
1
_name
.
c: restructure
disam
b
igua
t
ion of short nam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C Hamano
s
ha1_nam
e
.
c: cor
r
ect
m
isnamed "ca
n
onical
"
a
nd "res"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C H
a
mano
sha1_n
a
me
.
c: refactor find_
s
hort_packed_o
b
ject()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Juni
o
C
Hamano
sha
1
_n
a
me
.
c: rename "now" to "cu
r
rent"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C H
a
m
a
no
sha1_name
.
c: cla
r
ify what "
f
ake" is for in find_short
_
object
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
u
n
io C H
a
mano
sha1
_
n
a
m
e
.
c: get rid of get_sha1_with_mod
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Hamano
sha1_na
m
e
.
c: get rid of get_sha1_
w
ith_mode
_
1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C Ham
a
no
Sync with i18n-po up
d
ates in main
t
commit
|
commitdiff
|
tree
2012-07-02
Junio C
H
amano
Merge bran
c
h '
m
ain
t
'
of git://github
.
co
m
/gi
t
-
l
10n
/
git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio
C Hama
n
o
sha1_nam
e
.
c: hide get_sha1_with_context_1() u
g
li
n
ess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Jun
i
o C Hamano
b
lame:
c
o
m
pute abb
r
eviatio
n
w
i
dth that
e
nsures uniqu
e
ness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
uni
o
C
H
ama
n
o
diff-index
.
c: "git dif
f
" has no need to read blo
b
f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Ham
a
no
d
i
ff-in
d
ex
.
c
:
u
ni
f
y h
a
ndli
n
g o
f
comm
a
nd line
p
a
t
hs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Haman
o
diff
-
index
.
c: do n
o
t
p
ret
e
nd paths are pathspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Third
b
atch for
1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
M
e
rge
b
ranch 'fc/git-promp
t
-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
an
o
M
e
rge branch 'js/
s
ubmodule-relati
v
e'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Merge br
a
nch
'lk/more-helpful-stat
u
s-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hama
n
o
Merge branch 'lk/reb
a
se-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Ham
a
no
Merge branch 'jc/rev-l
i
st-si
m
plify-merges-first-parent
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Me
r
ge branch 'hv/sub
m
odule
-
up
d
at
e
-nuke-su
b
modules'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merge branch '
n
d/exc
l
u
d
e-
w
orkaround
-
t
o
p
-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge br
a
nch 'nd/str
e
a
m-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
M
e
rg
e
branc
h
'nd/stream
-
i
n
dex-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hama
n
o
Mer
g
e
branch 'mm/ve
r
ify-fi
l
e
n
a
m
e-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge br
a
nch 'jk/diff-
n
o-index-p
a
g
e
r'
commit
|
commitdiff
|
tree
2012-06-26
Jun
i
o C Hama
n
o
index-pack: Disable
thre
a
ding on
c
y
gwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
an
o
Second
bat
c
h for
1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
Merge
branch '
l
p
/
no-cmd-
h
ttp-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge b
r
a
n
ch 'cn/cherry-pick-range-docs'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hamano
M
e
rge
b
r
a
nch '
l
m/
g
it
-
bl
a
me-el'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
Merge
branch 'rs/ipv6
-
ssh-ur
l
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
a
m
a
no
Merge branch 'jc/u
s
tar-checksum-is
-
unsigned
'
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
io C Hamano
Merge branch 'rs/git-blame
-
mapcar-mapc'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Ha
m
an
o
Merge
b
r
anch 'rr/doc
-
comm
i
t
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
Merge bran
c
h 'n
d
/i18n
-
mi
s
c'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
Merge bra
n
c
h '
n
d
/i18n
-
bra
n
ch-lego'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch 'jk/n
o
-
m
ore-asciidoc7'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
test-
l
ib: reorder and
include
GIT-BU
I
LD-O
P
TIO
N
S a lot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
t/README: ad
d
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: enclose $PERL_PATH in double
quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
t
/
test-lib
.
sh: export
PERL_PATH for use in scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-22
Junio C Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2012-06-22
J
unio
C
Ham
a
no
Merge branch 'vr/help-per-platform
'
commit
|
commitdiff
|
tree
next