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
Merge branch 'bc/maint-am-email' into maint
2009-08-04
Miklo
s
Vaj
n
a
hg-to-git: don't import the
u
nu
s
e
d po
p
en2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
gi
t
-s
u
bmodule docu
m
entation: fix for
e
ach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklo
s
Vajna
g
i
t-svn documentation: fix typo in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
re
f
s: us
e
w
a
rning() instead
of fp
r
intf(std
e
rr, "war
n
ing
:
")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-sh
o
w-ref: use warning() instead o
f
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-branch: use warning() instead of f
p
ri
n
tf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
bu
i
ltin-rm: use wa
r
ning() instead
o
f fpri
n
tf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
los Vajna
bu
i
ltin-init-db
:
use
w
a
r
nin
g
(
)
instead o
f
fprintf(
s
t
d
e
rr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
builtin-fetch-p
a
ck:
u
se warning()
i
nstea
d
of f
p
rintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-che
c
kout: us
e
warning
(
)
instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos Vajna
builtin-apply: us
e
w
a
rning() in
s
tead o
f
fprint
f
(s
t
de
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http-push: using error() and warni
n
g()
a
s
appropriat
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklo
s
Vajna
Tests: use test_cmp instead of diff w
h
er
e
p
os
s
ible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mikl
o
s
V
ajn
a
parse-o
p
t: migrate
built
i
n-l
s
-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gi
t
tutorial
:
remove misleading n
o
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
iklos Vajna
M
ake t3411 exec
u
ta
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Mi
k
los Vajna
fast-export: print usage whe
n
no options specifi
e
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Va
j
na
parse-opt: migrate
bui
l
ti
n
-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos
V
a
jna
t9
1
2
9
:
skip the la
s
t th
r
ee tests i
f
UTF-8
l
ocale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklo
s
Vajna
Subm
i
ttingPatches:
m
ention th
e
usa
g
e of
r
eal name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos V
a
jna
githooks do
c
umentation:
add a
no
t
e
about
the +
x
mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
los Vajna
git-daemon documen
t
ation: use {
t
ilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Mik
l
o
s
Vajna
A
dd support fo
r
a pd
f
ve
r
s
ion of th
e
us
e
r
manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos Vajna
git-gui: Update Hungarian translati
o
n
f
or
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos Vajna
htt
p
.
c:
use 'g
i
t_config_strin
g
' to g
e
t 'cu
r
l_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vaj
n
a
submodule: use
git rev-
p
a
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vaj
n
a
rebase:
u
se git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los V
a
jna
pull:
u
s
e git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
j
n
a
los
t
-
found: use git rev
-
pa
r
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Va
j
na
filter-bra
n
ch: use git
r
e
v-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
git-
s
t
a
sh: u
s
e
git
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mik
l
os Vajna
U
ser's Manual: remove dupli
c
ated url at the
e
n
d
of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
b
u
i
l
tin_clone: use strbuf in cmd_clo
n
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
b
u
iltin-clone:
u
se
s
trbuf in clone_local() and co
p
y_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Va
j
n
a
buil
t
in-clo
n
e:
use strbuf in gu
e
ss_dir
_
n
a
me()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
i
k
l
os Vajna
Add new testc
a
se to
s
how fast-expo
r
t does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklo
s
V
a
jna
builtin-branch: use strbuf in ren
a
me_bra
n
ch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
builtin-branch: use strbuf in fill_track
i
ng_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
Vaj
n
a
bui
l
tin-branch: us
e
strbuf
in
d
e
lete_br
a
nc
h
es(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Upd
a
te Hungarian translation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mikl
o
s Vajna
git-r
e
mo
t
e:
d
ocument
the migr
a
tion feature of the ren
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Va
j
na
git-remote rename: migrate from remo
t
es/ and b
r
anc
h
es/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
M
i
klos Vajna
remote: a
d
d
a
new 'origin' variable
t
o
t
he struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Implement git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
i
k
l
os Vajna
u
p
d
a
te
-
r
ef --n
o
-
d
eref -d: handle the case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git
b
ranch -m:
forbid
r
enaming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git upd
a
te-ref --
n
o-deref
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
r
ena
m
e_ref(): handl
e
the c
a
se when t
h
e
r
eflog
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
F
ix git bra
n
c
h
-m
f
o
r symr
e
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklo
s
Vaj
n
a
parse-opt: migrate bu
i
lti
n
-check
o
ut-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
ajna
Add test
c
ase to
ensure mergin
g
an early part
o
f a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos
V
aj
n
a
Add Linux PPC supp
o
r
t
to the pre-auto-gc exampl
e
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mikl
o
s Vajna
test-lib: fix
c
olor reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos
V
a
j
na
Implement git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup
in sha1_
f
ile
.
c
::cach
e
_o
r
_
u
npack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builti
n
-commit: use reduc
e
_
hea
d
s()
o
nly when a
p
propriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos Vajna
b
u
iltin-merge: refresh the in
d
ex b
e
fore calli
n
g a s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
t7603: a
d
d new
testcases to ensur
e
builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
b
u
iltin-commi
t
: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
c
omm
i
t_tree():
add a new author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Va
j
na
t7501: always
use test_c
m
p
instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mik
l
o
s
Vaj
n
a
bui
l
tin-me
r
ge: release the
l
ockfile in try_merge_s
t
rat
e
gy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merge-r
e
cursive
:
ge
t
rid of
virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
ikl
o
s Vajna
merge-recur
s
ive: mo
v
e current_{file,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merg
e
-recursive: move
t
he global obuf to s
t
ruct m
e
rge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge
-
recur
s
ive: get rid of the index_only globa
l
va
r
iable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
i
klos
V
a
jna
merge-recursiv
e
: mov
e
call_depth
to struct mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os
V
ajna
Makefile: ad
d
merge_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
che
r
ry-pick/revert: make direct inter
n
a
l
c
a
ll
to merge_tree
(
)
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
builtin-merge: avoid ru
n
_command_
v
_opt() f
o
r
r
ecursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
mer
g
e-recursive
:
i
n
troduce merge_
o
ption
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
Split o
u
t
m
erge_recurs
i
ve
(
) t
o
merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los Vajna
Ma
k
efile:
enable S
N
PRINTF_RETURNS_BOGUS fo
r
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklo
s
V
ajna
Fix 'gi
t
help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
los Vajna
t930
0
: replace
'
!' with t
e
st
_
must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Do
c
umentation: document the pager
.
* configurat
i
on set
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos V
a
j
na
B
u
i
ltin git
-
h
e
lp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
i
k
l
o
s
Vajna
b
u
i
lt
i
n-help:
a
l
w
ays lo
a
d_com
m
and_l
i
st() in cm
d
_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os
V
ajna
Add a second testcase for
h
andling invalid strate
g
i
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
Ad
d
a ne
w
test for using a
custom merge
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-merge: allow
usi
n
g a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
builtin-hel
p
: make some internal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Va
j
n
a
t7601: extend
the 'merge
p
i
cks
u
p the best res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos V
a
jna
b
ui
l
tin-merge: give a
p
roper error
mes
s
age for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Va
j
na
Teach '
g
it
m
e
rge' that some mer
g
e st
r
ategi
e
s no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos
V
ajna
Add
a
ne
w
tes
t
for git-m
e
rg
e
-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: ad
d
a new test for git-
m
er
g
e
-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
m
a
ke remove-dashes
:
apply
to scripts and
p
rograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
g
i
t-bisect:
u
se dash-less form on git
bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos V
a
jna
t1007-hash-
o
bject
.
sh: use quotes for t
h
e test des
c
r
iption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t0001
-
i
n
it
.
sh: change c
o
nfusi
n
g directo
r
y
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos Vajna
Bu
i
ld in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
Fix t760
1
-merge-p
u
ll-config
.
s
h on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
git-c
o
mmit-tree: make
it usab
l
e fr
o
m
ot
h
er builtin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Add new test case
t
o ensure git-merg
e
prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos
Vajna
hg
-
to-git: use g
i
t init i
n
ste
a
d
o
f git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
V
ajna
hg-to-gi
t
: rewrite "git-f
r
otz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os
Vajna
hg-t
o
-git: ab
o
rt if the pro
j
e
ct directory is
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
hg-to-g
i
t:
a
v
oid
raising a st
r
in
g
ex
c
e
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajn
a
INS
T
ALL: Upda
t
e section about
git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next