repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
i18n: git-am gettext + gettext to stderr message
2011-05-21
Æ
v
ar Arn
f
jörð Bjarma
s
on
i18n:
g
it-am g
e
ttext + get
t
ext to stde
r
r m
e
ssage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-21
Ævar Arnfjörð
B
jarmason
i
1
8n: gi
t
-a
m
eval_get
t
ext messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-21
Ævar Arnf
j
örð Bjarmaso
n
i18n: git-am multi-line
g
etttext
$msg; echo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-21
Ævar Arnfjörð B
j
armason
i18n: g
i
t
-
am one-
l
ine
gettext
$
msg; echo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-21
Æ
var Arnfjörð Bjarmas
o
n
i
1
8n: git-am add gi
t
-
s
h-
i
18n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Æ
v
ar Arnfjörð Bjarm
a
son
Ma
k
ef
i
le
:
add
xgettex
t
target
for *
.
sh files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ævar A
r
n
fjörð
Bjarmas
o
n
git-sh-i18n
.
sh: add GIT_GETTEXT_POISON su
p
port
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnfjörð
Bja
r
mason
git-sh-i18n
.
sh: a
d
d
no-o
p
gette
x
t() and eval_gette
x
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Æva
r
Arnfjörð Bjarmason
git-sh-i18n--envsub
s
t: our own
e
nvsubst(1
)
for ev
a
l_g
e
ttext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Update draft releas
e
not
e
s to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio C
Ha
m
ano
Merge
br
a
n
c
h 'jn/run-com
m
and-error-failure'
commit
|
commitdiff
|
tree
2011-05-06
J
u
nio C Hamano
Merge branch 'js/info-man-path'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Mer
g
e branch 'i
m
/ha
s
h
cmp-optim'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge branch 'jk/merge-one-file-working-tree'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
M
e
rge
b
ran
c
h 'jc/f
i
x-diff-files-unmerged'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Merge bra
n
ch 'cj/p4me
r
ge'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
Merge
br
a
nch 'gr/cvsi
m
po
r
t-alter
n
ative-cvspass-location'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Ham
a
no
Merge bran
c
h 'sg/completion-cleanup'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
Merge b
r
anc
h
'js/
b
lame-parsename'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hama
n
o
Me
r
g
e
b
ranch 'j
k
/format-patch-quote
-
spec
i
al-in-from'
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Ha
m
a
n
o
Merge bran
c
h 'nd/struct
-
p
a
thspec'
commit
|
commitdiff
|
tree
2011-05-06
Junio C
H
amano
M
e
rge branch 'aw/
m
ai
n
t-rebase-i-p-no-
f
f'
commit
|
commitdiff
|
tree
2011-05-06
Junio C Hamano
M
e
rge branch 'mg/ali
a
s-expose
-
prefix'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C Hamano
M
erge
branch 'mg/d
i
ff-uiconfi
g
-doc'
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-05-06
João Britto
Remo
v
e d
u
plicated "
i
s a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
an
o
t
3
701: fix
h
e
r
e d
o
cume
n
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
M
i
chael
J Gruber
git-fa
s
t-impo
r
t
.
t
x
t
: --re
l
ative-m
a
rks takes no parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
ell
:
add
m
issing i
n
itializati
o
n of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
r
ian Gernhardt
t/annotate-tests: Use echo & cat instea
d
o
f
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
U
pd
a
te
draft r
e
lea
s
e not
e
s
t
o
1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
m
a
no
M
erge
branch 'ml/tes
t
-readme'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge bra
n
c
h 'ft/gitw
e
b-tar-
w
ith-gzi
p
-n'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
ama
n
o
Merge branch '
m
g/re
v
-
list-count-che
r
r
y
'
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Haman
o
Me
r
ge branch 'ss/doc-svn
'
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
ch '
j
n/fo
r
m
a
t-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch
'
vr/merge-base-d
o
c'
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge
br
a
n
ch 's
s
/cherr
y
-
p
ick-x-doc'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o C Haman
o
Merge bran
c
h 'jn/maint-format-patch-doc'
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
mano
Merge branch 'jk/form
a
t-patch-
m
ul
t
iline-header'
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge br
a
n
c
h 'jm/merg
e
to
o
l-submodules'
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Sync with 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hama
n
o
Git
1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
n
o
Mer
g
e branch 'j
h
/dirstat'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merge
branc
h
'sp/mai
n
t-cle
a
r-pos
t
fields'
i
nto
m
aint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Me
r
ge branch
'
jk/mai
n
t-stash-oob' i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
e
r
ge b
r
anch 'j
k
/maint-u
p
load
-
pack-s
h
allow' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge
b
ranc
h
'dm/stas
h
-
k-i
-
p'
i
nto
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
M
e
rge branch
'jc/pack-objects-bigfil
e
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch 'mg/reflog-with-
o
p
t
i
o
ns
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'jk/stash
-
loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Me
r
ge branch 'ar/cl
e
an-
r
mdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C H
a
mano
M
e
r
ge branch 'mg/sha1
-
path-advise'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin
H
a
e
n
el
git-add
.
txt: document 'add
.
ignoreErrors
'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C H
a
mano
U
p
date draft r
e
l
ease
n
otes
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
Merge branch 'jk
/
no
t
e
s
-ui-
u
pdates'
commit
|
commitdiff
|
tree
2011-05-02
Jun
i
o C Haman
o
M
e
r
ge
branch 'ab/i1
8
n
-fi
x
up'
commit
|
commitdiff
|
tree
2011-05-02
Ju
n
io C Hamano
Merge branch 'nm/submodule-upda
t
e-force'
commit
|
commitdiff
|
tree
2011-05-02
Juni
o
C Hamano
Merge branc
h
'jh/notes-add-ui'
commit
|
commitdiff
|
tree
2011-05-02
Junio C Hamano
Merge branc
h
'
nd/maint
-
set
u
p'
commit
|
commitdiff
|
tree
2011-05-02
J
unio C
H
amano
M
e
rge branch
'
mz
/
m
a
int
-
rename-unmerged'
commit
|
commitdiff
|
tree
2011-05-02
Jona
t
han Nieder
Documentat
i
on: clarify mea
n
i
n
g
of --html-path, --man
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-02
J
o
n Seymour
git: ad
d
--info-path and --
m
an-path
o
p
t
io
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
Update draft rele
a
s
e
notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Junio C
H
amano
Merge
b
ranch 'r
s
/
s
trbuf-setlen-ass
e
rt'
commit
|
commitdiff
|
tree
2011-05-01
Junio C Hamano
M
er
g
e branch 'vh/git-sv
n
-doc'
commit
|
commitdiff
|
tree
2011-05-01
Cia
r
an Jess
u
p
Pass empty file to p4merge where n
o
b
a
s
e is suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y Rou
i
llier
Look for pa
s
sword in both CVS and CVSNT passw
o
rd
file
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
rge-on
e
-file: fix brok
e
n merges with alter
n
ate
w
ork
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
add tests for merge-in
d
ex / merge
-
one
-
file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C Hamano
St
a
rt 1
.
7
.
5
.
1
mai
n
tenance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
M
e
rge branch 'mg/x-years-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-s
e
nd-email: f
i
x
miss
i
n
g space in error me
s
s
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh
S
tone
b
lame: tolera
t
e bogus e-mail address
e
s
a
bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Mathias Lafeldt
t/test-lib
.
sh: minor read
a
bility improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jim
M
eyering
diffcore-re
n
ame
.
c: avoid set-b
u
t-not-u
s
ed warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Junio
C Hamano
Merge branch 'jc/diff-irre
v
e
r
sible
-
delete'
commit
|
commitdiff
|
tree
2011-04-28
Junio
C H
a
mano
M
e
r
g
e
b
ranch 'jc/re
n
ame-
d
egrade
-
cc-to-c'
commit
|
commitdiff
|
tree
2011-04-28
Junio C Ha
m
ano
Merge branch 'mz/rebase'
commit
|
commitdiff
|
tree
2011-04-28
Jun
i
o C
Haman
o
Merge branch 'en/merg
e
-re
c
ursive'
commit
|
commitdiff
|
tree
2011-04-28
J
unio C Ham
a
no
Mer
g
e
branch 'jh/dirstat'
commit
|
commitdiff
|
tree
2011-04-28
Ju
n
io C Hamano
Merge branch 's
p
/maint
-
clear-po
s
tfie
l
ds'
commit
|
commitdiff
|
tree
2011-04-28
Ingo
M
olnar
hashcmp
(
): inline memcmp() by hand
t
o
optimiz
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andre
w
Wong
git-rebase--inter
a
c
t
i
ve
.
sh: pr
e
serve-merges fails on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
SZEDER
G
á
bo
r
c
o
mpletion: rem
o
ve unnecessary _get_com
p
_wor
d
s_by_ref
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
SZEDER Gábor
completion: don
'
t m
o
dify the $cur var
i
able in completio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-27
Jun
i
o
C
Haman
o
Start 1
.
7
.
6 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge bran
c
h 'mg/x-y
e
a
r
s-12-
m
onths'
commit
|
commitdiff
|
tree
2011-04-27
Junio C
Ham
a
no
Merge
branch 'cn/fo
r
mat-patch-quie
t
'
commit
|
commitdiff
|
tree
2011-04-27
Ju
n
io C
Hamano
M
erge bra
n
ch 'ef/maint-strbuf-init
'
commit
|
commitdiff
|
tree
2011-04-27
Junio
C
Hama
n
o
Merge br
a
n
c
h
'
rr/doc
-
content-type'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merge branch 'jc/m
e
r
g
e-dash-previous'
commit
|
commitdiff
|
tree
2011-04-27
Junio C
Hamano
Mer
g
e
branch 'dm/stash-k-i-p'
commit
|
commitdiff
|
tree
2011-04-27
J
unio C Hamano
Mer
g
e bra
n
ch 'rj/sparse'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merg
e
branc
h
'
j
k/maint-upload-pack-shallow
'
commit
|
commitdiff
|
tree
2011-04-27
Juni
o
C
Hamano
Merge
branc
h
'
n
k
/bl
a
me-abbrev'
commit
|
commitdiff
|
tree
2011-04-27
J
u
nio
C
Hamano
Merge br
a
nch
'
jk/ma
i
nt
-
stash-oob'
commit
|
commitdiff
|
tree
2011-04-27
Junio C Hamano
Merg
e
branch 'd
m
/color
-
palette
'
commit
|
commitdiff
|
tree
next