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
read_sha1_file(): allow selective bypassing of replacement mechanism
2011-05-15
Junio C Hamano
read_
s
ha1
_
fi
l
e(): allow selecti
v
e bypass
i
n
g of replacem
e
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
in
l
ine lookup_replace_object() ca
l
ls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
J
unio
C Hamano
read_sha1_file(
)
: ge
t
r
id
o
f
read
_
s
h
a1_
f
ile_repl()
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
t60
5
0:
make sure we test not just
c
ommit re
p
lacement
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hama
n
o
Declar
e
look
u
p_replace_o
b
ject() in cache
.
h, no
t
in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
un
i
o C Hamano
Update
draft re
l
e
ase notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'jn/run-command-e
r
ror-fa
i
l
ure'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Ham
a
n
o
Me
r
g
e branch
'
js/info-man-p
a
t
h
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge b
r
anch 'im/hashcmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
M
erge branch 'jk/merge-one-file-working-
t
ree'
commit
|
commitdiff
|
tree
2011-05-06
Junio C H
a
mano
Merge branch 'jc/fi
x
-diff-files-unm
e
r
g
ed'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Ha
m
ano
M
erge branch
'
c
j
/p4merge'
commit
|
commitdiff
|
tree
2011-05-06
Jun
i
o C Hamano
Me
r
ge
b
ranch
'gr/cvsimport-alt
e
rna
t
ive-cvs
p
ass-loc
a
tion'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
n
o
Me
r
ge bran
c
h
'sg/completio
n
-
cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Hamano
Merge branch 'js/blam
e
-par
s
ename'
commit
|
commitdiff
|
tree
2011-05-06
Ju
n
io C Hamano
M
erg
e
branc
h
'
j
k/for
m
a
t-patch-quote-special-in
-
f
rom'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C
Hamano
M
e
rge branch
'nd/struct-pathspec'
commit
|
commitdiff
|
tree
2011-05-06
J
u
n
io C Ha
m
ano
Merge bra
n
ch 'aw/maint-r
e
base-i-p-no-ff
'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge branch 'mg/
a
lias-expose-prefix'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
Merge br
a
nch 'mg/
d
iff-uico
n
f
i
g-
d
oc'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ha
m
ano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
2011-05-06
João B
r
itto
Remove duplicate
d
"is a
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C Hamano
t370
1
: fix he
r
e document
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael J Gruber
git-
f
ast-
i
mport
.
txt: --relative-marks takes no pa
r
a
m
ete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Sharov
shell: add
m
issi
n
g
i
nitialization of
argv0
_
path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernh
a
rdt
t/a
n
notate-
t
ests: Use echo
& cat ins
t
ead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
Hamano
Update draft release n
o
tes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
Hamano
M
erge bran
c
h 'ml
/
test-readme
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
Merge branch 'ft
/
git
w
eb-tar-with-gzip-n'
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o C Ham
a
n
o
M
erge branch
'mg/rev-lis
t
-cou
n
t-cherry'
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
M
e
rge branch
'
ss/doc-svn'
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C
H
aman
o
M
e
rge
b
ranch 'jn/for
m
at-
p
atch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch
'vr/merge-
b
ase-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Ha
m
ano
Merge branch 's
s
/cherr
y
-pick-
x
-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'
jn/maint-format
-
patch-doc
'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io
C Hamano
Merge
b
r
a
nc
h
'
j
k/format-
p
a
tch-mu
l
tiline-header'
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Ha
m
ano
Merge bran
c
h
'
j
m
/
m
erg
e
to
o
l-s
u
bmodules'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
aman
o
Sync
with 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Gi
t
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Me
r
ge branch 'jh/
d
irstat' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge branch 's
p
/main
t
-clear
-
postfields' int
o
main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Me
r
ge bran
c
h 'jk
/
maint-sta
s
h-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
erge
b
ra
n
ch 'jk
/
m
ain
t
-
u
plo
a
d
-
p
a
c
k
-shallow
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C H
a
mano
Merge branch 'dm
/
stash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e
branch 'jc/pac
k
-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Ha
m
ano
Merge bran
c
h
'
mg/reflog-with-
o
ptions' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hama
n
o
Merge branch 'jk/
s
tash-loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge branch 'ar/clean-r
m
d
ir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o
C
H
amano
Merge br
a
nch 'mg
/
sha1-
p
ath-advi
s
e' int
o
mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
V
a
l
entin Hae
n
el
git-add
.
txt: doc
u
ment 'add
.
i
g
n
or
e
Errors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Junio
C
Hamano
Update d
r
a
f
t release no
t
es to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C H
a
mano
Me
r
ge branc
h
'
j
k/no
t
e
s
-
ui-updat
e
s'
commit
|
commitdiff
|
tree
2011-05-02
J
u
nio
C Haman
o
M
erge bra
n
c
h
'ab/
i
18n-fixup'
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
i
o C H
a
mano
Merge branch 'nm/s
u
bmodul
e
-upda
t
e-fo
r
ce'
commit
|
commitdiff
|
tree
2011-05-02
J
u
ni
o
C Hamano
M
e
rge branch 'jh/notes-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
J
u
n
i
o C Haman
o
Merg
e
branc
h
'n
d
/
maint-setup
'
commit
|
commitdiff
|
tree
2011-05-02
Junio
C
Hamano
Mer
g
e b
r
anch 'mz/maint-rename-
u
n
mer
g
ed'
commit
|
commitdiff
|
tree
2011-05-02
Jo
n
ath
a
n
N
ie
d
er
D
o
cumentation: clarify meanin
g
of --ht
m
l
-path,
--
m
an
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-02
J
on Seymour
git
:
ad
d
--info-path and --man-path o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Juni
o
C
H
amano
U
pdat
e
d
raf
t
release notes to 1
.
7
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Me
r
g
e
b
r
a
n
c
h
'rs/strbuf
-
se
t
l
en-assert'
commit
|
commitdiff
|
tree
2011-05-01
Jun
i
o C Hamano
Me
r
ge
b
ra
n
ch 'vh/gi
t
-svn-do
c
'
commit
|
commitdiff
|
tree
2011-05-01
Ciara
n
Jessup
Pas
s
empty fil
e
to
p4merge
wh
e
re
no
base is sui
t
able
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
G
uy R
o
uillier
Look for
pas
s
word in
bo
t
h CVS and CVSNT password
f
iles
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
me
r
ge-one-file: fix broken merges w
i
th a
l
t
e
r
nate
w
ork
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add t
e
s
ts
f
o
r
m
e
rge-index / merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch '
m
a
i
n
t'
commit
|
commitdiff
|
tree
2011-04-29
J
uni
o
C Hamano
St
a
rt
1
.
7
.
5
.
1 maintenan
c
e
track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
Merge branch 'm
g
/
x
-years-12-months
'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
gi
t
-send-
e
m
a
il: fi
x
missing spac
e
i
n er
r
or
m
es
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
o
sh St
o
ne
blame:
t
o
l
erate bogus e-mail addresses a bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Mathias La
f
eldt
t/t
e
s
t-li
b
.
sh: mi
n
or readabi
l
ity impr
o
vemen
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jim Meye
r
ing
d
i
ffcore-rename
.
c: a
v
o
i
d
set-but-not-used warning
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Junio
C
Hamano
Mer
g
e
branch
'
jc/diff
-
irreversib
l
e-delete'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Hamano
Merge branch
'
j
c
/re
n
ame-
d
egrade-cc-to-c'
commit
|
commitdiff
|
tree
2011-04-28
J
unio
C
H
a
m
a
no
Merge branch 'mz/reba
s
e
'
commit
|
commitdiff
|
tree
2011-04-28
Juni
o
C Hamano
Merge b
r
anch 'en/merge-recursive'
commit
|
commitdiff
|
tree
2011-04-28
Juni
o
C
Hamano
Merge
bra
n
c
h
'jh/dirstat'
commit
|
commitdiff
|
tree
2011-04-28
Ju
n
io C Hamano
Mer
g
e bra
n
c
h 'sp/maint-cle
a
r-postfiel
d
s
'
commit
|
commitdiff
|
tree
2011-04-28
Ingo M
o
lnar
hashcm
p
(
)
:
inl
i
ne memcmp() by
h
and to optimize
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
An
d
rew Wo
n
g
g
i
t-rebase--interactive
.
s
h:
p
reser
v
e-merges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
SZEDER
Gábor
compl
e
tion: re
m
ove
u
nnecessary _get_comp_wo
r
ds_by_ref
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
SZ
E
D
E
R G
á
bor
comp
l
etion: don't mod
i
f
y the $cur variable
i
n completi
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
Juni
o
C
Ham
a
n
o
St
a
rt 1
.
7
.
6 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio C
H
amano
Merge br
a
nch
'm
g
/x
-
years-12-months'
commit
|
commitdiff
|
tree
2011-04-27
Junio C
H
ama
n
o
Merge branch 'cn/format-p
a
tch-quiet'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Ham
a
no
Merge bran
c
h
'ef/maint-str
b
uf-init'
commit
|
commitdiff
|
tree
2011-04-27
Juni
o
C Hamano
Mer
g
e branch 'r
r
/d
o
c-conten
t
-type'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
M
e
rge branch 'jc/merge-das
h
-previou
s
'
commit
|
commitdiff
|
tree
2011-04-27
Jun
i
o C Ham
a
n
o
M
e
r
ge branch 'dm/stash-k-
i
-p'
commit
|
commitdiff
|
tree
2011-04-27
Junio C
Hamano
M
erge branch 'rj/s
p
arse'
commit
|
commitdiff
|
tree
2011-04-27
Junio C
H
aman
o
M
e
rge branch 'jk/mai
n
t
-
uplo
a
d-pack-shallow'
commit
|
commitdiff
|
tree
2011-04-27
J
u
n
i
o
C
H
amano
Merge b
r
an
c
h
'nk/blame-abbrev
'
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio C Hamano
M
e
r
g
e branch 'jk/ma
i
n
t-sta
s
h-oob'
commit
|
commitdiff
|
tree
2011-04-27
Juni
o
C Hamano
Merge branch 'dm/
c
olor-palette'
commit
|
commitdiff
|
tree
2011-04-27
Jun
i
o C
H
a
m
a
no
Merge
branch 'jk/
s
tash-loosen
-
s
a
fe
t
y
'
commit
|
commitdiff
|
tree
2011-04-27
Ju
n
io C Hamano
M
e
rge branch 'jc/pack-objects
-
bigfile
'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge branch 'mh/git-svn-
a
utomkdi
r
s'
commit
|
commitdiff
|
tree
2011-04-27
Junio
C
Ham
a
no
Me
r
ge
b
ra
n
ch 'm
g
/
r
eflog-with
-
options'
commit
|
commitdiff
|
tree
next