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'
2009-03-24
Miklos Vajna
r
efs:
use warning
(
) inst
e
ad of f
p
rintf(std
e
rr,
"
w
a
rning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
builtin-sh
o
w-ref: us
e
warn
i
ng() ins
t
ead of f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin
-
sho
w
-
b
ranch: u
s
e warning()
instea
d
of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-
r
m: us
e
wa
r
ning() instead o
f
f
print
f
(stder
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vaj
n
a
b
u
ilt
i
n-ini
t
-db:
u
se
wa
r
ning() instead
o
f fprin
t
f
(
stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
builtin-fetch-p
a
ck: use wa
r
ning() instead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin
-
checkout: u
s
e war
n
ing() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
builtin-apply: use
w
arning
(
)
instea
d
of fprintf(s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http-push: using error() a
n
d wa
r
ni
n
g() a
s
appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklo
s
V
ajna
Tests:
u
se tes
t
_cmp instead of
diff where
p
o
s
sible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Va
j
na
parse-opt
:
migrat
e
builtin-ls-f
i
l
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
M
i
klos V
a
jna
gittutorial: r
e
move m
i
s
l
eading not
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Mikl
o
s Vajna
Make t3411 executab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
M
i
k
los Va
j
na
fa
s
t-expo
r
t:
p
r
int usage
when no o
p
tions
s
p
e
cified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklo
s
V
a
jna
parse-opt:
migrate builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mikl
o
s
V
ajna
t9129: skip the
last three tests i
f
UTF-8 local
e
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos V
a
jn
a
SubmittingPatches: men
t
ion the u
s
age of
r
e
a
l name i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Vajna
gi
t
hook
s
documentation: add
a
note
about the +x m
o
d
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Va
j
na
g
i
t-daemon documentation:
u
se
{
tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Mik
l
o
s
Va
j
na
Add s
u
pport for a pdf
v
e
rsion of the u
s
er manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
g
i
t-gu
i
: Update Hun
g
a
r
i
a
n trans
l
a
t
ion
for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
i
klos
Vajna
ht
t
p
.
c:
u
se 'git
_
c
o
nfig_string
'
to g
e
t
'curl
_
h
ttp_p
r
o
xy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s
V
a
jna
subm
o
dule: use git r
e
v-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase: use g
i
t rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git r
e
v-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
lo
s
t-found:
u
se git
re
v
-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filte
r
-
b
ranch: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stas
h
: use git r
e
v-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
Vajna
User's
Man
u
al: r
e
mo
v
e
duplicated
ur
l
at the end
o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajna
builtin_clo
n
e: use
strbuf
in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bu
i
ltin-clone: use strbuf in clone_local() and
c
opy
_
or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
builtin-clone: use strbuf
in gues
s
_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
iklos Vajna
Add new testcase
t
o show fast-export does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
builti
n
-bran
c
h: use strb
u
f in re
n
am
e
_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
builtin
-
branch: use strbuf in fill_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch: use strbu
f
in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Va
j
n
a
Updat
e
Hungarian translation
.
100% co
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-
r
emote: docu
m
e
n
t
the migration f
e
a
t
ure
o
f the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-
r
e
mote rename:
migra
t
e
f
r
om
remotes/ an
d
branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mik
l
os Vajna
remote: add a new
'
o
rigin' var
i
able to the
s
truct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Impl
e
ment git
r
emote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
i
klos Vajna
upd
a
te-ref -
-
no-de
r
ef -d: handle the case
w
hen
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git
branch -m
:
forbid renaming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
F
i
x
git upd
a
te-ref
-
-
no-
d
er
e
f -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajn
a
rename_ref
(
): handle the case wh
e
n the r
e
f
l
og of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
F
i
x git branch -m
f
o
r s
y
mrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mi
k
los V
a
jna
parse-opt
:
migrate builtin-checkout
-
index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
os Vajna
Add te
s
t
c
a
s
e
to ensure merging an e
a
r
ly pa
r
t of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Va
j
na
Add Linux PPC support to the
pre-au
t
o-gc ex
a
mple hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mik
l
os Vajna
test-lib: fix color re
s
et in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Va
j
na
Im
p
lem
e
nt git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos V
a
j
n
a
Clea
n
up in sha1_file
.
c::cac
h
e_or_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-commit:
u
s
e reduce_h
e
ads() o
n
ly when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
i
k
l
o
s Vajna
bu
i
ltin-
m
erge: refresh the index before call
i
n
g a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
j
n
a
t7603: add new test
c
ases
to en
s
ur
e
bui
l
t
in
-
co
m
m
i
t
uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use comm
i
t_tree
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vaj
n
a
commit_tree(
)
: add a new
a
uthor para
m
eter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t
7
50
1
: always use te
s
t
_
cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos
V
a
jna
bu
i
ltin-merge
:
release the lock
f
ile in try_me
r
ge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive
:
get r
i
d of virtual
_
id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
merge-recursive: move current_{f
i
le,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
m
erge-r
e
cursive: move the g
l
obal obuf
t
o str
u
ct merge_
o
pti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los V
a
jna
merg
e
-re
c
ursiv
e
: get rid
of the index_o
n
ly globa
l
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajn
a
merge-recu
r
s
ive: move cal
l
_de
p
th
t
o struct
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
Makefi
l
e: add mer
g
e_rec
u
rsive
.
h
t
o LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mikl
o
s Vajna
cherry-
p
ick/reve
r
t:
ma
k
e
d
i
rect inte
r
na
l
ca
l
l to
m
erge_tree(
)
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos
V
ajna
builti
n
-
me
r
ge: av
o
id run_c
o
mman
d
_v_opt() for recu
r
si
v
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos
Vajn
a
merge-recursive: introduce merge_op
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out merge_
r
ecursive(
)
to merge
-
rec
u
rsive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos V
a
j
n
a
Makefile:
e
na
b
l
e SNPRI
N
T
F
_R
E
T
U
RNS_B
O
GUS fo
r
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fi
x
'git
help help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
os Vajna
t930
0
: re
p
lace '!' with
te
s
t_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
Vajna
Documentat
i
on: document
t
he
pager
.
*
c
o
nf
i
guration s
e
t
tin
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vaj
n
a
Builtin git-
h
elp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
u
iltin-help: al
w
ays lo
a
d_command
_
list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
los Vajna
Add a second
t
e
stcase for handling
i
n
v
a
l
id st
r
a
t
eg
i
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add a new test for using a custom mer
g
e
s
trate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
l
t
in-me
r
ge: a
l
low using a custom
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
built
i
n-help: make some internal functio
n
s available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
Vajna
t7601: e
x
tend
the 'me
r
ge pi
c
k
s up the bes
t
resul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a proper er
r
or messag
e
f
o
r invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vaj
n
a
T
e
a
ch 'git merge' tha
t
some
m
erge strategies
no l
o
nger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajn
a
Add a new test for git-merge-reso
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
t6021: add a ne
w
te
s
t for
git
-
merge-re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
j
na
make rem
o
ve-dashes
:
ap
p
l
y
t
o
s
c
ri
p
ts and
pr
o
grams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
i
t
-
bisect
:
use dash-less
f
o
rm on
git
b
isect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos
V
a
j
na
t1007-hash-object
.
sh: use quotes for the test des
c
ript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-
i
nit
.
sh: ch
a
nge
c
o
nfusing
d
i
rect
o
ry name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
iklos Vajna
Build
i
n merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
F
i
x
t7
6
01
-
me
r
ge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
git-commi
t
-
t
ree: m
a
ke it
u
sable
f
rom
ot
h
e
r
builti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
A
dd
new te
s
t case
to en
s
ure git-merge
p
re
p
ends
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-
t
o-git: u
s
e git ini
t
instead of git init-d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
V
ajna
hg-to-
g
it: rewr
i
te "git-frotz" to "git f
r
o
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-
t
o
-git: abort if t
h
e pro
j
e
ct direct
o
ry is
n
ot a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s
Vajna
hg-to-git: avoid
r
a
i
sing
a string
e
xcept
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: Upd
a
te sectio
n
about
g
i
t
-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
kl
o
s Vajna
Retire 'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
Add new test ca
s
e to en
s
ure
git-merg
e
r
educes
oc
t
o
p
us
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajna
A
d
d new test to ensur
e
g
i
t-
m
erge handles
m
ore than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next