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 Haman
o
sha1_name
.
c
:
many short nam
e
s
c
an o
n
ly be
c
ommittish
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: ge
t
_sha
1
_1() takes
l
ookup flags
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
sha1_name
.
c: get_de
s
cribe_name() by defini
t
ion groks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C H
a
ma
n
o
rerere: make rr-cache fanout
directory
h
o
n
or umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Hamano
apply: document --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Hamano
apply:
a
l
l
ow rerere()
t
o
wo
r
k
on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
app
l
y: r
e
gister conflic
t
ed stages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
a
p
ply: -
-
3way
w
ith
a
d
d
/ad
d
confl
i
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
appl
y
: move verify_i
n
d
ex_match() higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: plug the t
h
ree-way merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
am
a
no
apply: fa
l
l b
a
ck on t
h
ree-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: ac
c
e
pt -3
/
--3way command line
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
apply: move "already exists" logic to ch
e
ck_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
appl
y
: m
o
ve c
h
e
c
k
_
to_create_blob(
)
c
l
oser to its sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Ha
m
ano
a
p
p
l
y: furthe
r
split load_pr
e
image
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
refactor
"
previous patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply:
s
plit load_pre
i
mage(
)
helper
f
unction out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: factor out checkou
t
_target
(
) helper fun
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
a
p
pl
y
: refactor read_file_or_gitlink
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: clear_image() cl
e
a
rs
t
hings
a
bi
t
more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
ap
p
ly: a bit
m
or
e
comment
s
on P
A
TH_TO_BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
apply:
f
ix an inco
m
pl
e
te comment in
che
c
k_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
a
n
o
Merg
e
g
i
t://githu
b
.
c
om/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
C
Hama
n
o
Fifth batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
M
erg
e
bran
c
h 'cw/help-
o
ver-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
mano
Merge branch '
m
z/empty-re
b
ase
-
test'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
Merge bra
n
ch 'pw/
g
it-
p
4-tes
t
s'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C H
a
mano
Merge
b
ra
n
c
h
'
j
s/f
a
st
-
exp
o
rt-paths-with-s
p
aces'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Haman
o
Merge branch 'cw/no-detachi
n
g-an-unbo
r
n'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge branch
'
vr/use-ou
r
-per
l
-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge br
a
n
ch 'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
g
e
branc
h
'
j
c
/
maint-blame-unique-
a
bbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch
'jn/perl-m
a
kemake
r
-l
e
ading-p
a
ths'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hama
n
o
Me
r
ge branch 'rj/pl
a
t
f
orm-pread-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Me
r
ge branch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C Hamano
Fou
r
t
h
b
a
t
ch
f
or
1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Me
r
ge branch 'nd/
c
lone-single
-
f
i
x'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C Ha
m
ano
M
erge branch '
t
h/
d
if
f
-
no
-
index-fixes
'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
M
e
rge branch
'
hv/remote-
e
nd-h
u
ng
-
up'
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hama
n
o
sha1_name
.
c: t
e
ach
g
et_short_sha1
(
)
a com
m
it-on
l
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha
1
_name
.
c: allow
g
et_s
h
or
t
_
sha1() t
o
take other
fla
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C
H
amano
get_sha1(): fix error st
a
tus regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hama
n
o
sha
1
_na
m
e
.
c:
r
estru
c
t
ure dis
a
mbiguation
o
f short n
a
mes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C Hamano
sha1_nam
e
.
c: correc
t
misnamed "canonical" a
n
d "res"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_n
a
m
e
.
c: r
e
factor find_s
h
ort_
p
acked_object()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio
C Hamano
sha1_name
.
c
:
rename "now" to
"
current"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o
C Hamano
sh
a
1_nam
e
.
c: clarify what
"fake"
is fo
r
in
find_short_obje
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Junio C Hamano
sha1_
n
ame
.
c: get rid of g
e
t
_sha1_with
_
mode()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-03
Jun
i
o C
H
amano
sha1_name
.
c:
g
e
t r
i
d of g
e
t_sha1_with_mode_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-po updates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C Haman
o
Merge branch 'maint' of git://g
i
thub
.
com/git-l10
n
/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Haman
o
sha1_na
m
e
.
c: hide get_sha1_
w
ith_c
o
ntex
t
_1() ugliness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
mano
blame
:
c
o
mpute abbre
v
i
ation
width that ensures uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
dif
f
-index
.
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
Hamano
d
if
f
-index
.
c: unify handli
n
g of command
line pat
h
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
diff-index
.
c: do n
o
t pr
e
t
e
n
d paths
ar
e
paths
p
ecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Thir
d
b
a
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
M
e
r
g
e bran
c
h
'fc/g
i
t-
p
rompt
-
script'
commit
|
commitdiff
|
tree
2012-06-28
J
unio
C
H
a
mano
Merg
e
branch 'js/submodu
l
e-rela
t
ive'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Ham
a
no
Merge branch 'l
k
/more-helpful-status-hints
'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C
Hamano
Mer
g
e branc
h
'
l
k/reb
a
se-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge
b
ranc
h
'jc/rev-list-
s
impli
f
y-
m
erges-f
i
rst-parent
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
a
mano
M
erge
branch '
h
v/submod
u
l
e
-updat
e
-nuke
-
submod
u
le
s
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Merge b
r
an
c
h 'nd/exc
l
u
de-
w
orkaround-top-heavy
'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
io C Hamano
Merge branch
'
nd/stream-pack-objec
t
s'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Mer
g
e branch 'nd/stre
a
m-index-pac
k
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Mer
g
e
bran
c
h
'
mm/v
e
rify
-
filename
-
fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Ham
a
no
M
e
rge branch 'jk/dif
f
-no-index-pager'
commit
|
commitdiff
|
tree
2012-06-26
Juni
o
C H
a
man
o
index-p
a
ck: Disab
l
e
thre
a
ding
o
n cygw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Sec
o
nd
batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'lp/no-cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Merge
b
ranc
h
'
cn/cher
r
y
-
pick-range-
d
ocs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch '
l
m/
g
it-bla
m
e-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Hamano
Merge
b
ra
n
c
h 'rs/ipv6-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Mer
g
e
b
ranch 'jc/usta
r
-checksum-is-unsign
e
d
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
Merge br
a
nch 'rs/git-blame-mapcar-mapc
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge
branch 'rr/d
o
c
-
commit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge bra
n
ch 'nd/i
1
8n-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C H
a
m
ano
Merge branch 'nd/i18
n
-branch-lego'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge b
r
a
n
ch 'jk/no-more-asciidoc7'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Ha
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o
C
Hama
n
o
t/README:
a
d
d
a
bit more Do
n
'ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
tests: e
n
clo
s
e $PERL
_
PATH in dou
b
l
e 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
Merge branch 'maint'
commit
|
commitdiff
|
tree
2012-06-22
Juni
o
C
H
a
m
ano
Merg
e
b
ranch 'vr/help-per-platfo
r
m'
commit
|
commitdiff
|
tree
2012-06-21
Jun
i
o C Hamano
Sy
n
c with 1
.
7
.
11
.
1
commit
|
commitdiff
|
tree
2012-06-21
J
u
nio C Hamano
The firs
t
bat
c
h for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-21
Jun
i
o C
Hamano
Git 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/maint-t1
3
0
4
-setfacl'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Hamano
Me
r
ge b
r
anch 'vr/help-
p
er-
p
l
a
tform'
commit
|
commitdiff
|
tree
2012-06-21
Junio
C Hamano
Merge b
r
anch 'jc/ls-files-i-dir'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Ham
a
no
Merge b
r
anch 'jk/v
e
rsi
o
n
-
string'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Haman
o
Merg
e
branch 'jc/request-pull
-
m
a
tch
-
t
agname'
commit
|
commitdiff
|
tree
2012-06-21
Junio C Ham
a
no
Merge
b
ranch 'jk/cl
o
ne-l
o
cal'
commit
|
commitdiff
|
tree
2012-06-21
J
u
ni
o
C Hama
n
o
M
e
rge branch 'jc/bu
n
dle
-
complete-noti
c
e'
commit
|
commitdiff
|
tree
2012-06-21
Junio C
H
a
mano
Kick off post 1
.
7
.
11 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-19
Junio C Ha
m
ano
show: fix "
r
ang
e
i
mplies walking"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-19
Junio C
Hamano
git-commit-tree(1): update synopsi
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-18
Junio C
Hamano
sha
1
_name
.
c: indentation fi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next