repo.or.cz
/
git
/
spearce.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-1.6.3' into maint
2009-08-04
Miklo
s
V
a
jna
hg-to-
g
it:
d
on't
i
mport the unused popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
git-submodule
d
oc
u
ment
a
tion: fix foreach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
g
i
t-svn doc
u
mentati
o
n: fi
x
typo in
'
r
ebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
los V
a
jna
refs: us
e
warning() i
n
stead of fpri
n
tf(stderr
,
"warning: "
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-
r
e
f
: use warning() instead
o
f fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
j
n
a
buil
t
i
n
-show-branch: use warni
n
g(
)
instead of fpr
i
ntf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
buil
t
in-rm: use
war
n
ing() instead of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
builtin-init-db: us
e
war
n
ing() instead of fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-fetc
h
-pack: use warn
i
ng
(
) inst
e
a
d
of fprint
f
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
ikl
o
s Va
j
na
bu
i
ltin-checkout: u
s
e
warning() i
n
s
t
ead of f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
builtin-apply
:
use warning() instead of
fpri
n
tf(stder
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
ht
t
p-push: using er
r
or() and w
a
rning() as appropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Mik
l
os
Vajna
Test
s
: use test_cmp i
n
stead of di
f
f wh
e
re pos
s
ible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
M
iklo
s
V
a
jna
parse-op
t
: migrate built
i
n-ls-
f
il
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mik
l
os Va
j
n
a
gitt
u
torial: remove m
i
sleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos
Vajna
Make t3411
e
x
ec
u
table
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos
V
ajna
f
a
s
t-
e
xport:
print usa
g
e when no options s
p
eci
f
ied
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
M
i
k
los Vajna
par
s
e
-
opt: mig
r
ate bu
i
ltin-a
p
ply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vaj
n
a
t9129: ski
p
the last
t
h
ree
t
e
s
ts
if
U
TF-8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPatches:
mention
the usage of
r
e
al nam
e
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
iklos Va
j
na
g
i
t
h
ooks documentation:
add a
note abou
t
t
he +x
mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git
-
d
a
emon
d
ocume
n
tation: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
iklos Vajna
Add suppor
t
for
a
p
df vers
i
on of the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-gui: U
p
date H
u
ngarian
translation
for 0
.
1
2
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos
V
a
j
na
http
.
c: u
s
e 'git_config_str
i
ng' to g
e
t 'curl
_
http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
V
a
jna
submodule: use git
re
v
-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
rebase: use g
i
t rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git rev-pa
r
se
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s
Vajna
lost-f
o
und: us
e
g
it re
v
-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklo
s
V
a
jna
filt
e
r-branch: use gi
t
rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stash: use git rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklo
s
Vajna
Us
e
r's
M
anual: remove duplicated url at the
en
d
of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajna
builtin_clone: u
s
e strbuf in cmd_c
l
one()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jna
builtin-clone: use strbuf
i
n
c
l
o
ne_local() and c
o
py
_
or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s Vajna
buil
t
in-clone: use strbuf in guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajn
a
Add new
testcase to show
fast-export
d
oes no
t
always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Vaj
n
a
builtin-bran
c
h: u
s
e
s
t
r
buf in
rename_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklo
s
V
ajna
builtin
-
br
a
nch:
use str
b
uf in fill
_
trackin
g
_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos Vajna
buil
t
in-
b
ra
n
ch: use strbuf
i
n dele
t
e
_
branches
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos V
a
j
n
a
Up
d
ate
Hungaria
n
translation
.
1
0
0% co
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
l
o
s V
a
jn
a
git-remote:
d
ocument th
e
migration
f
e
a
ture of the
r
ena
m
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos
Va
j
n
a
git-
r
e
m
ote rename: migrat
e
fro
m
remotes/ and
b
r
anche
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
r
e
m
o
te: add
a n
e
w
'
o
ri
g
in' variable t
o
the str
u
ct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mikl
o
s
Vajna
Implement git rem
o
te r
e
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklo
s
Vajna
upda
t
e-ref --no-deref -d:
handle th
e
cas
e
when th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos V
a
jna
gi
t
branc
h
-m
:
forbi
d
renaming of a
s
ymre
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix
g
it u
p
d
a
te-ref
--no-deref
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Vajna
rename_ref(): handle the case w
h
en the refl
o
g o
f
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vaj
n
a
Fix git branch -m for symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
p
arse-o
p
t: migrate built
i
n-c
h
e
c
k
out
-
in
d
ex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add te
s
tcase to ensure mer
g
ing an ear
l
y part
o
f a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add L
i
nux PPC s
u
pport to the pre-auto
-
gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajn
a
test-lib: fix color
r
eset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
V
ajn
a
Impleme
n
t git c
l
one -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
C
leanup in sha1_file
.
c::cache_or_un
p
ack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Vajna
builtin-commit: us
e
red
u
ce_heads() only when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajn
a
builtin-m
e
r
g
e
: refresh the ind
e
x
be
f
ore calli
n
g a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t760
3
: add new testcases to ensu
r
e builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
na
bui
l
t
i
n-commi
t
: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree():
a
dd a
n
ew au
t
hor parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Vajn
a
t
7501: always use test_c
m
p instea
d
of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
b
u
iltin-merge: release the lock
f
i
l
e in try_merge_s
t
r
ategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Vajn
a
merge-r
e
cursive:
get rid of virt
u
al_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
merge-
r
e
cursive
:
mov
e
cur
r
ent_
{
file
,
direc
t
o
r
y}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-recurs
i
ve: move the global o
b
uf
t
o struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-recursive:
ge
t
r
i
d of
t
h
e index_onl
y
global var
i
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
m
erge-re
c
u
rsi
v
e: move call_dep
t
h to struc
t
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefi
l
e:
add merge_r
e
curs
i
ve
.
h to
L
IB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
cherry-pick/re
v
ert: make direct internal call
to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-
m
erge:
avoid run_co
m
m
a
n
d_v_opt(
)
for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
aj
n
a
mer
g
e-r
e
cursive: introd
u
ce mer
g
e_op
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
Split
o
ut
merg
e
_re
c
ursive() to merg
e
-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefil
e
:
e
nable SNPRINTF_RETURNS_BOGUS fo
r
H
P
-U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
F
i
x 'git
hel
p
hel
p
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajn
a
t9
3
00: replace '!'
with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklo
s
Vajna
D
ocumentation: docu
m
ent
the pager
.
*
configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s V
a
jna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos V
a
jna
b
u
iltin-help
:
always
l
oad_command_l
i
st() in cmd_h
e
lp()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
ikl
o
s Vajna
Add a
s
econd
t
estcase for han
d
ling i
n
valid strategi
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
Add a n
e
w test for u
s
i
ng a
c
us
t
o
m
m
erge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
bui
l
tin-merge: a
l
low using a custom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
los
V
ajna
bu
i
l
t
in
-
help: make some int
e
rnal fu
n
ct
i
o
ns availab
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajn
a
t7601:
e
xtend the 'merge picks up
the b
e
st resu
l
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mik
l
os Vajna
built
i
n-mer
g
e: g
i
ve a pr
o
p
e
r error
m
e
ss
a
ge
f
or invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
V
a
jna
Teach 'g
i
t mer
g
e
'
t
h
at some merge
s
trategi
e
s
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
Add
a
ne
w
t
e
st for
g
it-m
e
rge-
r
e
s
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
t6021: a
d
d a n
e
w test for git-
m
erge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
m
ake remove-dashes: apply
t
o scripts a
n
d programs
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
git-bisect: use
dash-less
f
or
m
o
n git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
a
jna
t1007-hash-o
b
ject
.
sh: use quotes
for
the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
s
h
:
c
hange confus
i
ng
d
i
r
ectory n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mikl
o
s Vajna
Build in
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Fix t76
0
1
-mer
g
e
-
pull-config
.
s
h on A
I
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
a
j
na
gi
t
-
c
ommit-
t
r
ee: ma
k
e
i
t
us
a
ble from
o
ther
bui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add
n
ew test cas
e
to ensure
git-me
r
ge prep
e
n
d
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
: use git init inste
a
d o
f
gi
t
init
-
db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-
t
o
-
git
:
rewr
i
te "
g
it-frotz" t
o
"git frotz
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
h
g-to-git: abort if the p
r
oject
d
ir
e
c
tor
y
is not
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
to-git: avoid raisin
g
a
string excep
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
I
N
STALL: Update section about git-
f
r
otz
f
o
rm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next