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
rebase: remove obsolete and unused LONG_USAGE which breaks xgettext
2012-07-16
Junio C Hamano
Update draft r
e
leas
e
no
t
es
f
or 7
t
h bat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Merge branch
'
tg/maint
-
cache-name-compare'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C
Ham
a
no
Merge b
r
a
n
ch 'j
k
/index-p
a
ck-s
t
reaming
-
fix'
commit
|
commitdiff
|
tree
2012-07-16
Junio C H
a
m
ano
M
e
rge branch 'jk/mai
n
t-com
m
it-amend-onl
y
-no-
p
aths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch
'cw/amen
d
-commit-without
-
message'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Ham
a
no
Merge branch 'jn/makefile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge b
r
a
nch 'ar/clone-honor-umask-at-
t
op'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Hamano
Merge
b
ranch 'jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
J
unio C Ham
a
no
Mer
g
e branch 'cw/rebase-i
-
root'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Ha
m
ano
Merge bran
c
h 'p
w
/git-p4-
m
ove'
commit
|
commitdiff
|
tree
2012-07-14
Jun
i
o
C Hamano
Merge branch 'pw/git-p4-
j
obs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
H
amano
Merge branch 'jk/
p
us
h
-de
l
ete-ref-error-mess
a
ge'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Sixt
h
batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
aman
o
Merge bran
c
h
'jc
/
r
efactor-diff
-
std
i
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge bran
c
h
'tg/ce-na
m
elen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Mer
g
e branch 'tb/sanitize-decomposed-utf-8-pathn
a
me
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge branch
'
m
m/mediaw
i
ki-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Ha
m
ano
Merge bra
n
ch 'jn/vc
s
-svn'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
H
amano
Merg
e
bran
c
h 'mm
/
me
d
ia
w
iki
-
file-attach
m
ents'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge br
a
nch 'tr/
m
aint-show-
w
alk'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Merge branch
'
mz/rebase-no-m
b
ox'
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Hama
n
o
Reduce draft release notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
S
y
n
c
with
1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
G
i
t
1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
M
e
rge bra
n
ch 'jc/maint-bl
a
me-un
i
qu
e
-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C
Hamano
Merge branch 'r
j
/p
l
at
f
orm-pread-may-be-th
r
ead-un
s
afe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rg
e
branch
'th/diff-no-index-fixe
s
' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'nd/
c
lone-singl
e
-fix
'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'j
c
/rev-list-simplif
y
-merg
e
s-fi
r
s
t-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
a
mano
Mer
g
e branch 'hv/submodule-update-n
u
ke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Ha
m
ano
Merge branch '
j
k/di
f
f-n
o
-index-
p
ager'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hama
n
o
Me
r
ge branch '
m
m/verify-f
i
lename-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'cn/cherr
y
-
p
ic
k
-range-docs' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'j
c
/
u
star-check
s
u
m-is-unsigned' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'jc/bund
l
e-complete-
n
otice
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C Hamano
Merg
e
br
a
n
c
h '
j
c/ls-files-i-dir' into
main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
erge branch 'jc/req
u
est-pull-
m
atch-tagname' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C H
a
mano
c
ache_nam
e
_c
o
mpare():
d
o
n
o
t
truncate whi
l
e comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply: tests
f
or the --3wa
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
rerere: make rr-ca
c
he
f
anout
d
i
r
e
c
tory
honor umas
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ham
a
no
apply: document --3way opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
an
o
ap
p
l
y: allo
w
rerer
e
() to work
o
n --3w
a
y result
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: r
e
gister conflicted stages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: --3way with a
d
d/ad
d
con
f
lict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hama
n
o
a
p
ply: move ver
i
fy_ind
e
x_match() hig
h
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
app
l
y:
p
lug th
e
thr
e
e-
w
ay merge
l
o
gic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Haman
o
apply: fall back on three-w
a
y merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly:
accept
-3/--3way
c
omma
n
d
l
ine o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: mo
v
e
"already exist
s
"
l
ogic
to check_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move che
c
k_to_
c
r
eate_
b
lob() closer to its
s
ol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
apply: f
u
rth
e
r s
p
lit lo
a
d
_
preimage
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
a
m
a
n
o
a
p
ply: refactor "previo
u
s pat
c
h" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
s
plit loa
d
_preim
a
ge() helper fu
n
ction out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o C
H
a
mano
a
p
p
ly: factor out
c
h
eckout_target() helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ha
m
a
no
apply
:
r
e
factor read_
f
i
l
e_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
appl
y
: clear_im
a
ge()
clears
th
i
ng
s
a bit
m
ore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
aman
o
apply
:
a bi
t
m
ore comme
n
ts on PA
T
H_T
O
_BE
_
D
E
LETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
a
pply:
f
i
x an
inc
o
mplet
e
comment i
n
chec
k
_patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
m
a
no
Merge git://githu
b
.
com/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hama
n
o
F
ifth
b
atch
f
o
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Mer
g
e branch
'cw
/
help-over-network'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Mer
g
e branch 'm
z
/empty-rebase-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
M
erg
e
bran
c
h 'pw/git-p
4
-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge branch 'js/fast-
e
xport-pat
h
s-
w
ith
-
spa
c
es
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
no
Merge branch
'
cw/no-de
t
aching
-
an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge branc
h
'vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge b
r
anch 'mm/credential-pl
u
mbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
an
o
Merge branch 'jc/maint-blame-un
i
q
ue-abb
r
ev'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ham
a
no
Merge bran
c
h 'j
n
/perl-
m
akemaker-
l
eadi
n
g-
p
aths'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
m
a
no
Merge branch 'rj/pl
a
tform-pread-may-be-threa
d
-
u
nsaf
e
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Merge branch
'
mm/config-x
d
g'
commit
|
commitdiff
|
tree
2012-07-05
J
unio
C Hamano
Fourth batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio
C Ha
m
an
o
Merge
b
ranch 'nd
/
clone-si
n
gle-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
ano
Merge branch '
t
h/diff-no
-
index-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o C
H
a
mano
Merg
e
branch
'
hv/remote-e
n
d-hung-u
p
'
commit
|
commitdiff
|
tree
2012-07-02
Junio
C
Ha
m
ano
S
ync with i1
8
n-p
o
updates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
Merge br
a
nch
'
maint' of g
i
t://github
.
com/git-l10n/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio
C Hamano
blame: compute abbreviation widt
h
that ensu
r
es
u
niqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
i
o
C Hama
n
o
diff-index
.
c:
"
git
d
iff" has n
o
n
e
ed to read blo
b
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Ha
m
ano
diff-i
n
dex
.
c: unify handling of command line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
io C Ham
a
n
o
diff-index
.
c
: do not pretend paths
are
p
a
t
h
sp
e
cs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
Third batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
io C Hama
n
o
Merge
branch 'fc/git-promp
t
-script'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
Hamano
Mer
g
e
b
r
anch 'j
s
/sub
m
odule-relative'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hama
n
o
Me
r
ge branc
h
'lk/
m
ore-helpful-s
t
atus-hint
s
'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
Merge branch 'lk/re
b
ase
-
i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
Merge bran
c
h
'
jc
/
rev-l
i
st-si
m
plif
y
-me
r
ges-first
-
paren
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
Merge bran
c
h 'h
v
/subm
o
dule-upd
a
t
e
-nuke-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Ha
m
ano
M
e
rge
b
ranch 'nd/exclude-wor
k
a
r
o
und-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Ha
m
ano
Merge
b
ranch 'nd/str
e
am-pack-
o
b
jects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge b
r
anch 'nd/stream-index-pa
c
k'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
amano
Merge branch 'mm/ver
i
f
y-filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
amano
Merge branc
h
'
jk/di
f
f-no-inde
x
-pager'
commit
|
commitdiff
|
tree
2012-06-26
Ju
n
io C
Hamano
ind
e
x-pac
k
: Disabl
e
threading on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Hama
n
o
Sec
o
nd batch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C
H
am
a
no
M
e
r
ge branch 'l
p
/n
o
-cmd-http-fetc
h
'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C H
a
mano
Me
r
ge br
a
nch 'cn/cherry-pick-range-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merg
e
branch 'lm/git-blame-e
l
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Mer
g
e branch 'rs/ipv6
-
ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
M
e
r
ge
bran
c
h 'jc/ustar-checksum-is-unsigned'
commit
|
commitdiff
|
tree
next