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 'maint'
2010-07-13
Miklos V
a
j
n
a
format-
p
a
t
ch: document the f
o
rmat
.
t
o
configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vajna
request-
p
ull: avoid mentioni
n
g tha
t
the star
t
poin
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Mi
k
los Vajna
gitk: Updat
e
Hungarian tran
s
lation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
Documen
t
date formats accep
t
ed by parse_date()
commit
|
commitdiff
|
tree
2009-12-03
Miklos
V
a
jna
builtin-
c
ommit:
add --date option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
M
i
klos Vajna
git-s
t
ash documentat
i
on: mention
defa
u
lt opti
o
n
s
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Mik
l
o
s
Vajna
git br
a
n
ch -D
:
give a better error message when lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklo
s
Vajna
g
it-clo
n
e: add missin
g
comma
in --reference docum
e
ntation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Mi
k
l
o
s Vajna
hg-to-git: don't import the unused popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
M
i
klos
Vaj
n
a
git-s
u
bmodule do
c
um
e
ntation: fix foreach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
gi
t
-
s
v
n
do
c
um
e
ntation: f
i
x
typo in 'r
e
base vs
.
p
ull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs: use warning() inste
a
d o
f
f
p
r
intf(stder
r
,
"
warning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
b
uilt
i
n-sho
w
-ref
:
use
w
arning()
instead of fp
r
intf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
b
u
ilti
n
-show
-
b
r
anch: use warning(
)
i
n
stead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
l
o
s
Vajna
bui
l
tin-rm: u
s
e warnin
g
()
i
nstead of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
ik
l
os Vajn
a
b
u
iltin-init-db: use war
n
ing() instea
d
of fpri
n
t
f(st
d
err
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
builti
n
-
f
e
t
ch-
p
a
c
k: use warning
(
) in
s
tead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builtin-checkout: use
w
arni
n
g() inste
a
d
of f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
uiltin
-
apply: use warning()
i
n
s
t
ead of fprintf(st
d
err
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
h
t
tp-push: using error
(
) and warning() as
appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Tests: use test_cmp
in
s
tead of
d
i
ff where possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos V
a
jna
parse-opt: migrate builtin-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mi
k
los Vajna
g
i
ttutorial: remo
v
e mi
s
leading
note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
iklos V
a
jna
Make t3411 exe
c
utable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-exp
o
rt: print
u
sag
e
w
h
en
n
o
options speci
f
ied
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
parse-opt: migrate b
u
i
l
tin-a
p
ply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t9129: ski
p
t
h
e last
t
hree tests if UTF-8
locale
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
os Vajna
Su
b
m
i
ttingP
a
tc
h
es: mention the usage of real na
m
e
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
gi
t
hooks
d
oc
u
mentation: ad
d
a note abo
u
t the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s
V
ajna
git-daemon
documentation: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajna
Add support for
a
pdf vers
i
on of the
u
ser
manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Mik
l
os
Vajna
git-
g
ui
:
Update Hungarian tra
n
slati
o
n
for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c: u
s
e 'git_config_string' to
ge
t
'
c
u
rl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
s
ubmodule: use git rev-
p
a
r
s
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
r
e
ba
s
e: use
g
i
t
r
ev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s
Vaj
n
a
p
u
l
l: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
lost
-
f
o
und: us
e
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
kl
o
s Vajna
filt
e
r-branc
h
:
use
g
it
r
ev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-st
a
sh:
u
s
e
git rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User
'
s
Manual:
r
emove duplica
t
ed url
a
t
t
he end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin_clone: use strbuf in c
m
d_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vaj
n
a
builtin-clone: use strbuf in clone_local(
)
and
c
opy_o
r
_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jna
buil
t
in-clone: use strbuf i
n
guess_di
r
_
name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos V
a
jna
Add new testc
a
se to show fast-export
d
oes n
o
t alw
a
ys
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
bui
l
tin-branch: use strbuf in re
n
a
m
e_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
uiltin-b
r
anch: us
e
strbuf in
f
ill_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
lo
s
Vajna
builtin-branc
h
:
use
strbu
f
in
delete_br
a
nches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Update
Hungarian translation
.
100% co
m
p
l
eted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
klo
s
Vajn
a
gi
t
-
r
emo
t
e: document
t
he migratio
n
f
e
a
ture of the rena
m
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mikl
o
s Vajna
git-remote rename: migrate from remotes/ and
b
ranches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
re
m
ote: ad
d
a ne
w
'
origin' variable to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
i
k
los Vaj
n
a
I
mplement git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vaj
n
a
upda
t
e-ref --no-deref -d: handle th
e
case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vaj
n
a
g
it branch -m: forbid re
n
am
i
ng of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
ikl
o
s Vajna
Fix
g
i
t update
-
r
e
f
-
-n
o
-
d
e
r
ef -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Vajna
ren
a
me_ref(): handle the case whe
n
the r
e
fl
o
g
o
f a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
F
ix
g
it branch -m for symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-opt: migrat
e
b
u
iltin-c
h
ecko
u
t
-inde
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los Vajna
Add
t
e
s
tcas
e
to
e
nsure merging an
early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajn
a
Add Linux PPC su
p
port to the pre-auto-gc
e
x
a
mple h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
iklos V
a
j
n
a
tes
t
-lib
:
fix
color reset in s
a
y_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Vajna
Impleme
n
t git c
l
one -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos Vajna
Cleanup in sh
a
1_file
.
c::c
a
che_
o
r
_unp
a
ck_ent
r
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mikl
o
s
V
aj
n
a
builtin-com
m
it: us
e
red
u
ce_
h
e
a
ds() onl
y
when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vaj
n
a
builtin-merge
:
refresh the index before calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
t7603:
add new
t
e
stcases to e
n
sure builtin-commit us
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
buil
t
in-c
o
mmit: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
na
c
om
m
i
t_tree(): add a new author par
a
meter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
t7501: alway
s
use test_cmp ins
t
ead of
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
b
u
ilti
n
-
mer
g
e: release the lockfile in try_
m
er
g
e
_
strategy
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vaj
n
a
m
e
rge-recursive: get rid of virtu
a
l_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
me
r
ge-recursive: move cu
r
rent_{file,di
r
ectory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Va
j
n
a
merge
-
recurs
i
v
e:
m
ove the global obuf to
s
t
r
uct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-
r
ecursiv
e
: g
e
t rid
of the index_only global varia
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recursive:
m
ove call_dep
t
h
to st
r
u
ct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
lo
s
Vajn
a
Make
f
ile: add
m
erge_r
e
cursive
.
h to L
I
B_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mikl
o
s Vajna
c
h
erry-pick/revert: make direct int
e
rnal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
builti
n
-mer
g
e
:
avoid run_command_v_opt() for rec
u
rsive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajn
a
merge
-
recu
r
sive: intr
o
duce
m
er
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
Split out merge_recursive() to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los
V
ajn
a
M
ak
e
f
il
e
: en
a
ble SNPRINTF_RETURNS_BOGUS
f
or HP
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git help help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
iklos Vaj
n
a
t
9
300
:
replace '!'
w
ith t
e
st_must
_
f
ail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
o
s Vajna
Documen
t
a
t
i
o
n:
document the pager
.
* configuration s
e
tti
n
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
u
ilt
i
n
git-
h
elp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
u
ilt
i
n-help: alway
s
lo
a
d_command_list() in
c
m
d
_
h
e
l
p()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
los Vajna
Add a second
testcase f
o
r handling invalid
strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test for usin
g
a custom
m
er
g
e strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
builtin
-
merge:
allow
u
sin
g
a cu
s
to
m
strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
a
jna
b
uilti
n
-
h
elp:
m
ake
som
e
internal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mik
l
os Vajna
t7601:
extend
the 'merge picks up
t
he
b
est result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vaj
n
a
b
u
i
ltin-m
e
rge: gi
v
e a proper
er
r
o
r mes
s
age for
i
nvalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s
Vaj
n
a
Teach 'git m
e
r
g
e' that som
e
m
erge strategies
no lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
l
os Vajna
Add a new
test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: a
d
d a new test
f
or g
i
t-merge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove
-
dashes: apply to scripts and
prog
r
a
m
s
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bis
e
ct: use dash-less form on gi
t
bi
s
ect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
ikl
o
s Vaj
n
a
t
1
007-hash-
o
b
ject
.
sh: use quo
t
es for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
j
na
t
0
00
1
-in
i
t
.
sh: ch
a
nge conf
u
sing direc
t
or
y
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
l
os Va
j
na
Build
in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next