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
builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
2009-03-24
Miklos Vajna
bu
i
ltin
-
checkout: use warning()
i
n
stead o
f
f
printf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
buil
t
in-
a
pply: use warning() instead of f
p
rintf(st
d
err
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http-push: usi
n
g er
r
or()
and warning() as appro
p
riate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Tests: use test_cmp
instead of diff wher
e
pos
s
ible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajna
parse-op
t
: migrate b
u
i
lt
i
n-l
s
-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gitt
u
t
or
i
al: remove mis
l
eadi
n
g note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
i
klos
V
a
jna
Make
t
34
1
1 executab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
M
iklos Vaj
n
a
fast-export: print usage when no options specif
i
ed
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
M
i
klos Vajna
p
arse-opt: m
i
grate builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mi
k
los V
a
jna
t91
2
9
:
skip the
las
t
three
t
ests if UTF-8 local
e
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklo
s
Vaj
n
a
Submitting
P
atches
:
m
e
n
tion the u
s
age of real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks documenta
t
ion:
a
dd a note abo
u
t the
+
x mod
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os Vajna
git-daemo
n
documen
t
ation: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklo
s
V
ajn
a
Add support
f
or a
p
df version of the us
e
r manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Va
j
na
git-gui: Update Hungarian tr
a
nslatio
n
f
or 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Mikl
o
s Vajna
http
.
c
:
use 'git_confi
g
_str
i
ng' to get 'curl_http_prox
y
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodu
l
e: use gi
t
rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Va
j
n
a
rebase
:
use gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git
r
ev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost
-
found:
use
git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s
Vajna
f
i
lter-branch
:
u
s
e git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos V
a
jna
git-stash: use git rev-p
a
rse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vaj
n
a
U
s
er's Manual
:
remov
e
d
up
l
icated url at the end
o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
los Vajna
b
u
il
t
in_c
l
one: use
s
trbuf i
n
cmd_
c
lone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
j
na
builtin-clone: use strbuf in clone_local() and
c
opy_or_
l
i
nk_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bui
l
tin-clo
n
e: use strbuf
i
n guess_dir
_
name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mik
l
os
Vajn
a
Add ne
w
tes
t
case to sh
o
w fast-e
x
port does not
a
lways
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
bui
l
tin-branch: use strb
u
f
in rename_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos
Va
j
na
builtin-bran
c
h: use strbuf in
f
ill_tracki
n
g_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajn
a
b
u
i
l
ti
n
-branch: us
e
strb
u
f in
d
elet
e
_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
U
pd
a
t
e Hungarian
t
ranslation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote: documen
t
the migrati
o
n
fe
a
ture of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklo
s
V
a
j
na
git-remot
e
rename: migra
t
e from
r
emote
s
/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos V
a
jna
remote
:
add a new 'orig
i
n
' variable to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Implement
g
it rem
o
te re
n
a
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
i
k
los
Vajna
upd
a
te-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
V
ajna
git branch -m: forbid renamin
g
of a s
y
m
ref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
Fix git update-ref --no-d
e
r
e
f
-d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
r
e
name_ref(): handle the case when
the reflo
g
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git branch -m for
s
y
mre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
M
iklos
V
ajna
parse-o
p
t: migrate bui
l
ti
n
-che
c
kout-in
d
ex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vaj
n
a
A
dd tes
t
c
a
se to en
s
ure
merging an
e
arly part
of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los V
a
j
na
Add Linux PPC s
u
p
port to the p
r
e-auto-
g
c
examp
l
e hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
Vajn
a
test-lib: fix colo
r
r
e
set in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos
Va
j
na
Implem
e
nt git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s V
a
j
na
Cle
a
n
u
p in sha
1
_file
.
c
:
:
ca
c
he_o
r
_un
p
ack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-
c
ommi
t
:
use
reduce_he
a
d
s
()
o
nl
y
w
hen appropriat
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajn
a
builtin
-
merg
e
: refresh
t
he inde
x
bef
o
re calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
t7603: add new testcases
t
o en
s
u
r
e builtin-co
m
mit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
built
i
n-commit: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
co
m
m
it
_
tree(): add a new author parame
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
na
t7501:
a
lways use test_cmp instead o
f
dif
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mikl
o
s Vajna
bui
l
ti
n
-mer
g
e
:
r
e
leas
e
the lockf
i
le
i
n try_m
e
rge_strategy(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajn
a
merge-recursive: get
rid of
virtual_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
mer
g
e-recursive:
m
ov
e
current_{
f
ile,directory}_se
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos
V
ajna
merge-rec
u
rsi
v
e: move the global ob
u
f to struc
t
m
erge
_
optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: get rid of
t
he index_only global vari
a
bl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recurs
i
ve: move call_dept
h
to struct m
e
r
g
e_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
Mak
e
fil
e
: add mer
g
e_recursiv
e
.
h
t
o
LIB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
c
h
erry-pick/r
e
v
e
rt: make d
i
re
c
t int
e
r
nal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
builti
n
-me
r
ge: avoid run_comm
a
nd_v_opt(
)
for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
merge-recursive
:
in
t
roduce mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
j
n
a
S
plit out merge_recurs
i
ve() t
o
merge-re
c
ursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos Vajna
Makefile
:
enabl
e
SNP
R
I
NTF
_
RETURNS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajna
F
ix 'g
i
t
h
e
lp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
los Vajna
t9
3
0
0: rep
l
ace '!' with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
Documentati
o
n: docume
n
t the pager
.
* conf
i
gur
a
tion setti
n
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Va
j
na
Builtin
git
-
help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
ik
l
os Vaj
n
a
builtin-help: always load_command_li
s
t() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
Add a seco
n
d te
s
tcase for handling inval
i
d strategi
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
kl
o
s Vajna
Add a new test for using
a custom mer
g
e strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klo
s
Vajna
builtin-me
r
ge: allo
w
using
a
c
u
stom
st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
b
u
i
ltin-help:
m
ake some internal functions availab
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
los V
a
j
na
t7601: extend the '
m
e
r
ge picks
u
p t
h
e best res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-mer
g
e: give
a
p
roper error mess
a
ge
f
o
r inv
a
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vajn
a
Teach 'git merg
e
' tha
t
some
mer
g
e
s
t
rategies no lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new te
s
t
f
or
g
it-
m
erge-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s
V
ajna
t6021: add a
n
ew test for git-me
r
ge-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
make remove-dashes: apply to scripts and p
r
ograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
git-bisec
t
:
u
se
d
a
sh-less
fo
r
m on git bisect lo
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
t1007-h
a
s
h
-object
.
s
h
: use q
u
otes f
o
r t
h
e te
s
t descr
i
p
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0001-i
n
i
t
.
sh: change confus
i
n
g direc
t
ory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
V
aj
n
a
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fi
x
t
760
1
-merge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
git-co
m
m
i
t-tr
e
e
:
mak
e
i
t
usable from o
t
her builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
d
d new
test case to
ensure git-merge prepe
n
ds the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g
-to-git: use git
init instead
o
f git init-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-git: re
w
rite
"git-fro
t
z"
to "git
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-gi
t
: abort
i
f
the proje
c
t directory
i
s no
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-git: avoid rais
i
ng
a st
r
ing exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
o
s Vaj
n
a
I
NSTALL:
U
pd
a
te section about git-
f
r
o
tz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vaj
n
a
Re
t
ir
e
'
stup
i
d' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add ne
w
tes
t
case to ensu
r
e git-merge reduces oc
t
opus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d
new test to en
s
ure git-
m
erg
e
ha
n
dle
s
more
t
h
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
aj
n
a
I
n
trod
u
ce get_octopus_
m
erge_bases(
)
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
gi
t
-fmt-me
r
ge-m
s
g: make i
t
us
a
ble from other
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_ca
c
he_unmerge
d
() to
r
ead-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
Vajna
A
d
d
ne
w
test to ensure g
i
t-merge handles
pull
.
twohea
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajn
a
M
o
ve parse-options's sk
i
p_prefix() to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_l
i
s
t_
c
o
u
nt()
t
o commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next