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 'jc/apply-3way'
2012-07-16
Junio C Ha
m
ano
M
erge
b
r
anch 'jc/a
p
ply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
Hamano
Merg
e
bran
c
h 'cw/r
e
base
-
i
-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge bran
c
h 'pw
/
git-p4-mo
v
e
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
Hama
n
o
M
e
rge
b
ranch 'pw/
g
it-p4-jo
b
s'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
H
am
a
no
Mer
g
e br
a
nch
'j
k
/push-dele
t
e-ref-
e
r
ror-
m
e
s
s
a
g
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
a
mano
Sixth batch for
1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C Hamano
Merge branch 'jc/refactor
-
diff-s
t
din'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hama
n
o
Merge
b
ranch 'tg/ce-na
m
elen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Mer
g
e bran
c
h
'
tb/san
i
tize-decomposed-utf-8
-
pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge branch 'mm/medi
a
w
ik
i
-
t
ests'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge
branc
h
'
j
n
/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hama
n
o
Merg
e
bran
c
h 'mm/me
d
iaw
i
ki-fi
l
e-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
H
amano
Merge bra
n
ch 'tr
/
maint-
s
how-walk
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'mz/re
b
a
s
e
-
n
o-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Reduce draft release n
o
tes to 1
.
7
.
1
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
S
y
n
c with
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
G
it 1
.
7
.
11
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
M
e
rge branch 'jc/ma
i
n
t-blame-uniqu
e
-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hamano
Merge branch
'
r
j/platform-pread-may-be-thr
e
ad-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 't
h
/
d
if
f
-no-index-fixes' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Me
r
ge branch 'nd/clone-sin
g
l
e-fix' int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C H
a
ma
n
o
Mer
g
e branch 'jc/rev-
l
is
t
-simplify-me
r
ges
-
first-par
e
nt
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'hv/
s
u
bmodule-u
p
date-nuke
-
s
ubmodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch '
j
k/dif
f
-
n
o-i
n
dex-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
M
e
rge br
a
n
c
h 'mm/verify-filename-fix' int
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge branch
'
cn/ch
e
rry-pick-ran
g
e-doc
s
' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Mer
g
e branc
h
'jc/ust
a
r-checksum-
i
s-unsigned' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'jc/bundle-c
o
mp
l
ete-notice
'
into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merg
e
b
r
a
n
c
h 'jc/ls-files-i-dir
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
H
a
m
a
no
Merge b
r
anch '
j
c/request-pull-m
a
t
ch-tagname' into m
a
int
commit
|
commitdiff
|
tree
2012-07-10
Juni
o
C Ha
m
ano
a
p
ply: t
e
sts fo
r
the
--
3
way optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: do
c
ument --3way op
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o C
H
a
mano
app
l
y: allow rerere()
to work on --3way results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
a
n
o
apply: reg
i
ster c
o
nfl
i
c
ted
s
tages to the i
n
dex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o
C Hamano
a
pply: --3way wi
t
h a
d
d/add co
n
f
l
ict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ham
a
no
apply:
m
ove verify_i
n
dex_ma
t
ch() high
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
m
a
no
apply: plug
the t
h
re
e
-way
m
e
r
g
e
logic in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
apply:
f
all 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 Ham
a
no
apply:
a
c
c
ept -
3
/--3w
a
y command line
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
apply: move "alre
a
dy exist
s
" logic to chec
k
_to_crea
t
e(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
ap
p
ly: move
c
heck_to_crea
t
e_blo
b
() cl
o
ser to i
t
s sole
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
apply:
f
ur
t
her split
load_preimage()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
app
l
y
:
refactor "previou
s
patch"
logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
H
amano
apply
:
split
load_preimag
e
() helper function out
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: factor out c
h
eckout_targ
e
t() helper functio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ham
a
no
a
p
ply: refactor read_fil
e
_or_gitlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C Hamano
appl
y
: clear_image() clears
t
hings a bit more
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
apply: a bit more comments on PATH_TO_BE_DEL
E
TED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
amano
a
pply: fix an incomplet
e
c
omm
e
nt in c
h
eck
_
patch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge git://github
.
com/git-
l
10n/gi
t
-
po
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio
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
J
u
n
i
o
C Ham
a
no
Merge bran
c
h 'cw/help-over-ne
t
work'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge
b
ran
c
h '
m
z/empty-
r
ebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merge br
a
nch
'
pw/gi
t
-p4-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
u
ni
o
C
H
amano
Merge branch 'j
s
/fast-export-paths-
w
ith-s
p
a
c
es'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
erge
bra
n
ch 'cw
/
no-d
e
t
achi
n
g-an-u
n
born'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Merge branch 'vr/use-our-perl-
i
n-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
mano
Merge branch
'
mm/credent
i
al-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
M
erge
b
r
anch '
j
c/maint
-
blame-uni
q
ue-
a
bbrev'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C Hamano
Merge b
r
an
c
h 'jn/perl-makemaker
-
leading-paths
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Merge branch 'r
j
/p
l
a
tf
o
rm-p
r
e
ad-may-be-t
h
read-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge bra
n
c
h
'
mm/conf
i
g
-
xdg'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C H
a
m
ano
Fourth batch
f
or 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Hamano
Merge branc
h
'nd/clone
-
single-fi
x
'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
H
a
ma
n
o
Mer
g
e b
r
anch 'th/diff-no-ind
e
x-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
M
e
rge branch 'h
v
/remote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Sync
w
ith i18n-po updates in maint
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Hamano
Merge
branch 'maint' o
f
git://github
.
c
o
m/git
-
l
1
0n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
J
u
n
i
o C Hama
n
o
blame
:
compute abbr
e
viation w
i
dth tha
t
ensures uniqueness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C H
a
mano
d
i
ff-
i
ndex
.
c:
"
git diff" has
no need to read blob from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
d
iff-inde
x
.
c: unify
handling
of comman
d
line p
a
ths
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
a
n
o
diff-index
.
c: do not pret
e
nd
p
a
t
hs ar
e
p
a
t
hspecs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Hamano
Third
ba
t
c
h
f
or 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'fc/git-prompt-
s
cript
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge branch 'js/submodule
-
relative'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merge b
r
a
n
ch 'lk
/
more-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge br
a
nch 'lk/rebas
e
-i-x'
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
i
o C Haman
o
M
e
rge branch
'
jc/rev-list-s
i
mplify-merges-first-parent'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge
b
ranch 'hv/submod
u
le-upda
t
e-
n
uke-submo
d
ules
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'n
d
/
excl
u
de-workarou
n
d
-
t
op-heav
y
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Me
r
ge branch 'nd/str
e
am-pa
c
k-
o
b
ject
s
'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Hamano
M
e
rge branch 'nd/stream-
i
n
d
ex
-
pack'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C
H
amano
Merge
b
ranch
'
mm/ve
r
ify-fi
l
ena
m
e-f
i
x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'jk/diff-no
-
i
ndex-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hama
n
o
index-pack: Disable threadi
n
g on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Second batch
f
or 1
.
7
.
12
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Merge b
r
anch 'lp/no-cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merge branch 'cn/cherry-
p
ick-ra
n
ge-doc
s
'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Haman
o
M
e
r
ge br
a
nch 'lm/git-bl
a
me-el'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C
H
aman
o
Merge branch
'rs
/
ipv
6
-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Ham
a
no
Mer
g
e branch 'jc/usta
r
-checksum-is-u
n
s
i
gned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
amano
Merge branch '
r
s/git-blame-mapcar
-
map
c
'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Ha
m
ano
Mer
g
e
branch
'
rr/d
o
c-com
m
it'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'nd/i1
8
n
-
mi
s
c'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
Merge
b
ranch 'nd/i18n-branch-lego'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Hamano
M
erge br
a
nch 'jk/no-more-asciidoc7'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
t/README: add a bit more
D
o
n'ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
tests: enclose $PE
R
L_
P
AT
H
in d
o
uble quote
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2012-06-25
J
u
ni
o
C Hamano
t/test-lib
.
sh
:
e
xport
P
ERL_P
A
TH for use in scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next