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 'cb/doc-fetch-pull-merge' into maint
2009-10-12
Miklos Vajna
git
-
stas
h
documentation: mention def
a
ult options f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
M
i
klos Vaj
n
a
g
i
t branch
-D:
g
ive
a
better erro
r
message
w
hen lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
M
i
klos Vajna
git-c
l
one: add missing comma i
n
--ref
e
ren
c
e
documen
t
ation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vaj
n
a
hg-to-
g
i
t
:
do
n
't import th
e
u
n
used popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
gi
t
-su
b
mod
u
le
documentation: fix foreach
exam
p
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklo
s
Vajn
a
g
i
t-
s
vn documentation
:
fix
t
ypo in
're
b
as
e
vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
r
e
fs: use
warnin
g
(
)
i
n
stead of f
p
rintf(stde
r
r
,
"warning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vaj
n
a
b
u
iltin-show-r
e
f:
use w
a
rni
n
g(
)
instead of fp
r
intf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
builtin-show-bran
c
h
:
u
se war
n
ing() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
u
iltin-rm: use
w
arning() inste
a
d of
f
printf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-init-db:
u
se warning() instead of fpr
i
n
t
f(std
e
r
r
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
builtin-fetch-pac
k
: use warning() instea
d
of fprin
t
f
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
builtin-che
c
k
out:
u
se warnin
g
()
i
nstead of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
builtin-a
p
ply:
u
se warning() instea
d
of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
http-push: us
i
ng error() and warning() as approp
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
M
i
klos Vajna
Tests:
u
se
test_c
m
p ins
t
ead of di
f
f whe
r
e
po
s
sible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos
Vajna
p
arse
-
opt: migrate builtin-ls-fil
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mi
k
l
os Vajna
gittu
t
or
i
al: remo
v
e misleading
note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
ikl
o
s Vajna
M
a
k
e t3411 ex
e
cutable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-export: pri
n
t usa
g
e when no options speci
f
i
e
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
parse-opt: migrate builti
n
-appl
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mik
l
os Vajna
t91
2
9: skip
t
he last three tests if UTF-8
locale i
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
Submitti
n
gPatches: mention
t
he usage of rea
l
name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
los Vajna
githook
s
documentation: add a note about the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daem
o
n
documentati
o
n
: use
{
tild
e
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajna
Add suppor
t
f
o
r a pdf version o
f
the user ma
n
ual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos
V
ajna
g
it
-
gui: Update Hungarian translation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
htt
p
.
c: u
s
e 'git_
c
onfig_
s
tring' to get
'c
u
rl_http_pr
o
xy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodul
e
: us
e
git re
v
-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
rebase: use
g
it rev-p
a
rse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
p
ull
:
use git r
e
v-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
lost-found: use
g
i
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
fi
l
ter-branc
h
: u
s
e g
i
t rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
git-s
t
ash
:
use git
rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
M
i
k
los Vajna
Use
r
's Manu
a
l: remove du
p
li
c
ated url at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jna
bu
i
ltin_clone:
u
s
e
strbu
f
in c
m
d_c
l
one()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Va
j
na
builtin-clone:
use strbuf in
c
lone_
l
o
c
al() and
c
opy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builti
n
-clone: use
strbuf
i
n guess
_
dir_nam
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mi
k
l
o
s Vajn
a
Add new testcase to show fast-export does no
t
always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajn
a
builtin-branc
h
: use strbuf in rename_bra
n
ch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os V
a
jna
bu
i
l
t
in-branch: use str
b
uf in fil
l
_tra
c
king_info(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos V
a
jna
built
i
n-branch: use strbuf in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Va
j
n
a
U
pda
t
e
Hu
n
g
arian transl
a
tion
.
100%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remot
e
: document the migration feature of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
iklos Vajna
git-remote rename: migrate from rem
o
tes/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mikl
o
s Va
j
na
remote: add a new 'orig
i
n
'
vari
a
bl
e
to t
h
e
stru
c
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mikl
o
s Vajna
Imp
l
e
m
e
nt git rem
o
te r
e
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Mikl
o
s
V
ajna
upda
t
e-ref --no-deref -
d
: handle the case whe
n
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mi
k
los Vajna
git br
a
nch -m: forbi
d
renaming of a sy
m
r
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix
g
it update-ref --
n
o-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_re
f
(): ha
n
dle the
case w
h
en t
h
e ref
l
og of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
ajna
Fi
x
git branch -m fo
r
symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mikl
o
s Vajna
pa
r
se-opt: migra
t
e buil
t
in-
c
heckout-inde
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add te
s
tcase to ensure merging an
e
arly
p
art of a b
r
anch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
Add Linux
PPC suppo
r
t to
the pre-a
u
to-gc exam
p
le hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklo
s
Vajna
test-lib: fix co
l
o
r
reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos Vajna
Implemen
t
gi
t
clone -
v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s Vajna
Cleanup
i
n sha1_file
.
c
:
:cac
h
e_or_unpack_
e
ntry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Vajna
bu
i
ltin-commit:
u
se
r
ed
u
c
e
_heads() only when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajn
a
builtin-merg
e
: r
e
fresh t
h
e
index before
calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
los Vajna
t
7
603: add new testcases to
e
nsure builtin-c
o
mmit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajn
a
b
uiltin-commit: use c
o
m
m
it_tr
e
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
com
m
i
t_tree(): add a new author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
j
n
a
t7501: a
l
ways use test_cm
p
instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mi
k
los
V
ajna
bui
l
tin-me
r
ge: release the
lockfile in try_me
r
ge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
merge-r
e
cursive
:
get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
a
jna
merge-rec
u
rsive: move c
u
r
r
e
nt_{file,dire
c
tory}_
s
et
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
los
Vajna
m
e
r
ge-r
e
cursive
:
move
th
e
g
l
ob
a
l obuf to
struct merge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
me
r
ge-recursive: get rid o
f
the ind
e
x_only glo
b
al vari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s V
a
j
na
merge-re
c
ursive: mo
v
e
c
a
ll
_
depth to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
Makefile:
a
dd
m
er
g
e_recursive
.
h to LIB
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os Vajn
a
ch
e
r
r
y-pick/
r
evert
:
m
a
ke direct internal call to me
r
ge_
t
ree()
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vaj
n
a
builti
n
-merg
e
:
a
v
oid run_comma
n
d_v_opt()
f
or recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
aj
n
a
merge-recursive: introduce mer
g
e_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
l
o
s Vajna
Spli
t
o
u
t
m
erge_re
c
ursive() to mer
g
e-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enable SNPRINTF_RETU
R
NS_
B
O
G
U
S
for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vaj
n
a
Fix 'git help he
l
p'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vajna
t
9
3
0
0: rep
l
ace '
!
' wi
t
h test_must_
f
ail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
l
o
s
Vajna
Documentation: document the page
r
.
* configuration set
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os V
a
jna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
ik
l
os V
a
jna
builtin-help: always load_com
m
and_list
(
) in cm
d
_
h
el
p
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d a
s
econd testcase for
h
and
l
in
g
invalid strateg
i
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a
new
t
est for usi
n
g a custom m
e
rge
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
lo
s
Vaj
n
a
builtin-m
e
rge: allow
u
s
i
ng
a
custom
s
t
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
builtin-help: make some internal
f
u
n
ctions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos
Vajna
t7601:
e
xtend th
e
'm
e
r
g
e picks up the
b
est
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vaj
n
a
builtin-merge: give a proper
e
rror messag
e
f
or
i
n
v
alid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos Vajna
Teach 'git merge' that some
m
e
r
ge strateg
i
e
s
no
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
los V
a
jn
a
Add a
new
t
est for git-me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajna
t6021: add
a
new test for g
i
t-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
make remo
v
e-dashes: app
l
y to scripts a
n
d programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
git-bisect:
u
se
d
a
s
h-less for
m
on g
i
t bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t1007-hash-object
.
sh: us
e
quot
e
s
for t
h
e test de
s
cription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t0001-init
.
sh: change co
n
f
using directo
r
y name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos V
a
jna
Bu
i
ld in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
aj
n
a
Fix
t
7601
-
merge-pull-config
.
sh
o
n AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
it
-
commit-t
r
ee: make
i
t usabl
e
from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
Add new te
s
t
c
ase to
ensu
r
e
g
it-merge
p
repends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s Vajna
hg-to-gi
t
: use git init instead
of git
init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to-gi
t
:
rewri
t
e
"gi
t
-fr
o
tz" to "git
frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next