repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/mergetool-tool-help'
2012-07-09
Ju
n
io C Hamano
sh
a
1
_
name
.
c
: many short
n
a
m
es can onl
y
be
co
m
mittis
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_
n
ame
.
c: get
_
sha1_
1
(
)
t
a
ke
s
lookup f
l
ags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
sha1_name
.
c
: get_describe_name() by d
e
finiti
o
n groks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
rerere: make rr-cach
e
fanout directory honor umask
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C
H
amano
appl
y
: docume
n
t --3way option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
a
pply:
a
ll
o
w
rerere() t
o
work on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
a
pply: register conflicted s
t
ages to the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
ap
p
ly: --3way wit
h
add/
a
dd
c
onflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
a
no
ap
p
ly
:
move
v
e
r
ify_in
d
ex_
m
atch() h
i
ghe
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
apply: pl
u
g the t
h
ree-wa
y
merge lo
g
i
c in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: fa
l
l back
on th
r
ee
-
way merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: accept -3/--3
w
ay comman
d
line o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply:
move "already exists" l
o
gic
to c
h
eck_to_create()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: move
c
heck_to
_
c
r
eat
e
_blob() c
l
oser to it
s
s
o
le
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
a
pply: further sp
l
it
l
oad_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
r
e
factor "
p
revious patch"
l
ogic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
apply:
s
plit loa
d
_preimage() helper functi
o
n
out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
apply: factor out checko
u
t
_
t
arget() help
e
r function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: refacto
r
re
a
d_f
i
le_or
_
gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
apply: clear_image() c
l
e
a
rs things a
b
i
t mo
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply:
a
bit more
comments on PATH
_
TO_BE
_
DELETE
D
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fi
x
a
n
incomplete
c
omment in
c
heck_patc
h
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C H
a
man
o
Merge git:/
/
github
.
com/git-l10
n
/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Fifth batch for 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Me
r
ge
branch 'c
w
/help-over-netwo
r
k'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge b
r
anch 'mz/empty
-
re
b
ase-test'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hama
n
o
Mer
g
e branch 'pw/git-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rg
e
bran
c
h 'js/fast-export
-
paths-wit
h
-spac
e
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch '
c
w/no-
d
etachi
n
g
-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
b
r
a
nch
'
vr/use
-
o
ur-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge br
a
nch 'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C Hamano
M
erge branc
h
'jc/
m
aint
-
blame-unique-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
m
a
no
Merg
e
br
a
nch
'jn/perl-
m
a
k
emaker-leading
-
paths'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Haman
o
Merge
branch
'
r
j
/
p
latform-pread-m
a
y
-be-thread-un
s
afe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
Merge
b
ranc
h
'mm/
c
onfig-
x
dg'
commit
|
commitdiff
|
tree
2012-07-05
J
unio C Ham
a
no
Fourth bat
c
h for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
am
a
no
Me
r
ge branc
h
'nd/cl
o
ne-si
n
gle-fix'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C Hamano
Merge br
a
n
ch 'th/diff-no-index-
f
ixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
H
amano
M
e
rge branch 'hv
/
remote-end
-
hung-up'
commit
|
commitdiff
|
tree
2012-07-03
Ju
n
io C Hamano
s
ha1
_
name
.
c: teach g
e
t_short_
s
ha1() a commit-only option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1_name
.
c: allow get_short_sh
a
1() to take ot
h
er
flags
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
Haman
o
get_sha1(): fix err
o
r s
t
at
u
s regression
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
J
unio C Hamano
s
h
a
1_name
.
c: restructure disambiguation
of short
n
ame
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
sha1_name
.
c: correct misnamed "ca
n
o
n
ica
l
"
and "res"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sha1_name
.
c: refac
t
or find_short_packe
d
_object()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C
Hamano
sha1_name
.
c:
r
e
nam
e
"now" to "current"
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
:
clarify
w
hat "fak
e
" is fo
r
in f
i
nd_s
h
ort_obj
e
ct
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_na
m
e
.
c
:
ge
t
rid of get_sha1_with_
m
ode(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_na
m
e
.
c: get r
i
d of g
e
t_s
h
a1_w
i
t
h_
m
ode_1()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Junio C Haman
o
Sync with i
1
8n-
p
o updates in ma
i
nt
commit
|
commitdiff
|
tree
2012-07-02
Junio
C Haman
o
Merg
e
branch 'maint' of
git://github
.
c
om/git-l1
0
n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Ju
n
io C Ham
a
no
sha1_
n
a
me
.
c
:
hide get_sha1_with_context_1() u
g
liness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C
Hama
n
o
bla
m
e: compute abbreviation width that ensur
e
s uniqueness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
uni
o
C Hamano
diff-ind
e
x
.
c
:
"git diff" has no need to re
a
d blob from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
m
ano
dif
f
-index
.
c:
un
i
fy handling o
f
comm
a
n
d
lin
e
paths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C
Hamano
diff-i
n
dex
.
c:
d
o
not pretend
p
at
h
s
a
re pathsp
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
Junio C Ham
a
no
Merge b
r
anch 'fc/git-prompt-scri
p
t'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch '
j
s/subm
o
dule-relative'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
Merge
branch 'lk/more-help
f
ul-sta
t
u
s-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge branch 'l
k
/
rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Merge b
r
anc
h
'jc/rev-list-simplify-merge
s
-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
Merge
b
ranch
'hv/submodul
e
-update-
n
uke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Me
r
ge branch 'nd/
e
xclude-workar
o
u
nd-
t
op-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
Merge b
r
anch 'nd/stream-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merg
e
branch 'nd/s
t
ream-index-pack'
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
io C
Ham
a
no
Merge br
a
nch 'mm
/
verify-filename-f
i
x'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Merg
e
b
r
anch 'jk/diff-no-in
d
ex-p
a
ger'
commit
|
commitdiff
|
tree
2012-06-26
J
unio C Haman
o
index-pack: Disable thre
a
ding o
n
c
y
g
win
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Hama
n
o
Second batch for 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
Me
r
g
e
branch
'
l
p/no-cmd-http-fetc
h
'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C H
a
mano
Merg
e
branch 'cn
/
cherr
y
-pick-range-docs'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C
H
am
a
no
Merge
bra
n
ch 'lm
/
gi
t
-blame-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
Merge branch 'rs
/
ipv6-ss
h
-ur
l
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merg
e
branch 'jc/ustar-checksum-is-unsigned
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge bra
n
c
h
'rs/git-blam
e
-mapca
r
-mapc'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hama
n
o
M
e
rge b
r
anch 'rr/doc-c
o
mmi
t
'
commit
|
commitdiff
|
tree
2012-06-25
J
unio
C
Hamano
Merge branch '
n
d/i1
8
n
-mi
s
c'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge
branch 'nd/i18n-bra
n
ch-lego'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'jk/no-more-asc
i
idoc7'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
t/README:
add a
b
it more Don'ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
te
s
t
s: en
c
los
e
$PERL_PATH
i
n
double
quotes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Ham
a
no
t
/
test-lib
.
sh: export PERL_PA
T
H for u
s
e in scr
i
pts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-22
Ju
n
io
C
Ha
m
an
o
Merge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2012-06-22
Junio
C Haman
o
Mer
g
e branch 'vr
/
help-p
e
r-platform'
commit
|
commitdiff
|
tree
2012-06-21
J
u
nio C Hamano
S
ync with 1
.
7
.
11
.
1
commit
|
commitdiff
|
tree
2012-06-21
Junio C
Hamano
The first batch for
1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-21
Junio C H
a
mano
Gi
t
1
.
7
.
11
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Merge branch 'jk/m
a
int-t1304-setfacl'
commit
|
commitdiff
|
tree
2012-06-21
J
u
nio C Hamano
Merge branch 'vr/h
e
lp-per-platf
o
rm'
commit
|
commitdiff
|
tree
2012-06-21
Junio C H
a
mano
Merge b
r
anch 'jc/l
s
-files
-
i-dir'
commit
|
commitdiff
|
tree
2012-06-21
J
unio C Hamano
Merge bra
n
ch 'jk/vers
i
o
n
-string'
commit
|
commitdiff
|
tree
2012-06-21
J
unio C
Hamano
Merge branch 'jc/request-pull-
m
atch-tagname'
commit
|
commitdiff
|
tree
2012-06-21
Junio C
Hamano
Merge branch 'jk/clone-
l
ocal'
commit
|
commitdiff
|
tree
2012-06-21
Jun
i
o C Haman
o
Merge bra
n
c
h 'jc/bundle
-
complete-
n
ot
i
ce
'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
K
ick of
f
post 1
.
7
.
11 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-19
J
u
nio
C H
a
mano
s
how: fix "range implies wal
k
ing"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-19
Jun
i
o C
H
a
man
o
g
it-commi
t
-tree
(
1
)
: update
synopsi
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-18
J
u
nio C Hamano
sha
1
_na
m
e
.
c: indentation f
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next