repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge commit 'j6t/master' into devel
2009-03-24
Miklos Vajna
r
e
fs:
u
se warn
i
n
g
() instead of fprintf(stderr,
"
wa
r
ning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-ref: use w
a
rn
i
ng() instea
d
of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-bra
n
ch: u
s
e warnin
g
() instea
d
of fp
r
intf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklo
s
Vajna
builtin-rm: use
w
arnin
g
()
i
n
st
e
ad of f
p
rin
t
f(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-
i
nit-db:
u
se wa
r
ning() i
n
stead o
f
fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
iklos V
a
jna
b
u
iltin
-
f
e
tch-pack:
u
s
e
warning() i
n
stead
o
f
fp
r
int
f
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
builtin-check
o
ut: use warning()
instead of fprin
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vaj
n
a
buil
t
in-apply:
u
se warning()
i
n
stead of f
p
ri
n
t
f
(
stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
http-push:
using
e
rror() and warning() as appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos
V
ajna
Tests
:
u
s
e
test_cmp in
s
t
e
a
d of d
i
ff where
possibl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajna
parse-opt: migrate builtin-ls
-
files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos V
a
jn
a
g
itt
u
tori
a
l: remove mislea
d
i
n
g n
o
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
i
klos Va
j
na
Mak
e
t3411 exe
c
utable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos
Vajna
f
a
s
t-e
x
port:
print usage w
h
en no options spe
c
ifie
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
parse
-
o
p
t:
migrate bu
i
ltin-
a
pply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t912
9
:
skip the
l
a
s
t three tests i
f
UTF-
8
l
o
cale
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vaj
n
a
SubmittingPatches: mention
t
h
e
u
s
a
ge of real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks document
a
tion: ad
d
a
note
about the
+x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Vajna
git-daemon documentation: use
{
tild
e
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Mi
k
lo
s
Vajna
A
dd support for a pdf version of
t
he us
e
r manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Mikl
o
s Va
j
na
git-gui:
U
p
d
ate
Hu
n
ga
r
ian tra
n
slation for
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c
:
use 'git_config_string' to get 'curl_
h
t
t
p_proxy
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s
Va
j
na
subm
o
dule: use git rev-parse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
l
os Vajna
rebase: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Vajna
pul
l
:
use git
r
e
v-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklo
s
Vajna
l
o
st-fou
n
d: use git rev-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
filter-br
a
nch: use git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
gi
t
-stash: us
e
git
r
ev-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mik
l
os Vajna
U
s
e
r's Manu
a
l: remove dupl
i
cate
d
url at t
h
e end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
ajn
a
builtin_clone: use s
t
r
b
uf
in cmd_
c
lone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klos
V
ajn
a
built
i
n
-clone: use
s
t
rbuf in clone_loc
a
l() an
d
c
o
py_o
r
_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
k
l
o
s
V
ajna
buil
t
in
-
clone: use strbuf in guess_dir_nam
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
i
k
l
os Vajna
Ad
d
n
ew testcase to sh
o
w fa
s
t-export doe
s
not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
ikl
o
s Vajna
bu
i
ltin-branch
:
use strb
u
f in
ren
a
me_b
r
anch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-bran
c
h: use
s
trbu
f
in f
i
ll_t
r
acking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
b
u
il
t
in-branch
:
use st
r
buf i
n
delete_bra
n
che
s
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos V
a
jna
Update
Hunga
r
ian transl
a
tion
.
100% comp
l
ete
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mikl
o
s Vajna
git-remote: document the
m
igration fe
a
ture of the
r
ename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos
Vajna
git-remote rename: mig
r
ate from
remotes/ an
d
bra
n
ches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos
V
a
j
na
r
emote: add a new
'o
r
igin' variable to
t
h
e
s
tru
c
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklo
s
Vajna
Imp
l
ement git remote re
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos
Vajna
update-re
f
-
-no-
d
eref -d
:
handle t
h
e case when t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
g
i
t branch
-
m
: forbi
d
renaming of a s
y
mref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
a
jna
Fix git up
d
a
t
e-
r
ef -
-
no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los V
a
jna
re
n
ame_ref(
)
: handle
t
he c
a
se whe
n
t
h
e refl
o
g
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix g
i
t branch -
m
for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mik
l
o
s
V
ajna
p
arse-
o
pt: mi
g
r
ate
buil
t
in-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
ajna
Ad
d
tes
t
case to
ensu
r
e merging a
n
early pa
r
t of a
b
r
anch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klos Vajna
Add Linux PPC support t
o
the pre-aut
o
-g
c
example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
ikl
o
s
V
a
j
na
test-lib: fix col
o
r r
e
set in s
a
y_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klo
s
Vajna
I
m
plement
git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup i
n
sha
1
_
file
.
c::cache_or_u
n
pack_entry
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-commit: u
s
e
reduc
e
_heads
(
)
o
n
ly when ap
p
rop
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
i
klos V
a
jna
bui
l
tin-merge
:
refresh the
i
ndex before
c
alling a stra
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
t7603: a
d
d new tes
t
cases
t
o
e
ns
u
re builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
builtin
-
commit: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
c
o
mmit_tree(): add a new author
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jn
a
t7501: always use
t
est_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mi
k
l
os V
a
jna
buil
t
in-merge: release th
e
lockf
i
le in try_merge_
s
trategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
m
e
rge-
r
ecursive: get rid
of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
merge-recu
r
sive: move current_{f
i
le,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
me
r
g
e-recursive
:
move the glob
a
l obuf to
s
truct
mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merg
e
-recursive:
ge
t
rid of the i
n
dex_only glob
a
l varia
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
V
ajna
m
e
rge-r
e
curs
i
ve: mo
v
e
ca
l
l_
d
epth to
stru
c
t merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
Make
f
ile: add merge_recursive
.
h to
L
IB
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
j
na
cherry-pi
c
k/revert: make dir
e
ct
i
ntern
a
l c
a
ll to me
r
ge_tre
e
()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
bu
i
ltin
-
m
erg
e
:
avoid ru
n
_command_v_opt(
)
for re
c
u
r
s
ive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
los Va
j
na
merge-recur
s
ive: introd
u
ce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
Split out merge_
r
ecursive(
)
t
o merge-r
e
curs
i
ve
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
M
a
kefile
:
enable
S
NPRINTF_RETURNS_BOGUS for
H
P-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mikl
o
s Vajna
Fix 'gi
t
help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vajna
t9300: replace '!
'
w
ith te
s
t_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mikl
o
s Vajn
a
Documentatio
n
: documen
t
the
p
a
g
e
r
.
* configuration s
e
t
t
i
ng
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Vajn
a
B
u
iltin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mik
l
o
s
Vajn
a
b
u
il
t
in-help: a
l
ways load_com
m
and_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s
V
aj
n
a
Add a second testcase fo
r
h
a
nd
l
ing inva
l
id stra
t
egi
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a
new test fo
r
u
sing a custo
m
m
erge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
builti
n
-merg
e
: allow using a cust
o
m strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los
Vajna
b
uiltin-
h
elp:
make some
i
n
ternal functions avail
a
ble
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t
7
601: extend the 'merge picks u
p
the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
Vajna
b
u
ilt
i
n-merge: give a pro
p
er erro
r
message fo
r
i
n
valid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Vajna
Teach 'git merge' th
a
t some merge
strategies no lon
g
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
Add a ne
w
test fo
r
git-m
e
r
ge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6
0
21:
a
dd a new test for git-merg
e
-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos
Vajna
m
ake remove-das
h
e
s:
a
pply to scripts and progra
m
s as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vaj
n
a
git-bisect: use dash-less form on git bisect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
t1007
-
hash-object
.
sh:
u
se quotes fo
r
the test
d
escription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Va
j
na
t0001-i
n
it
.
s
h: chang
e
confusin
g
directory nam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build i
n
m
e
rge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-merge-pull-conf
i
g
.
sh
on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-com
m
i
t
-tre
e
:
m
a
ke it
u
sab
l
e
f
rom o
t
he
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Add n
e
w test ca
s
e
to en
s
ure git-m
e
rge p
r
e
p
en
d
s the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: use
git init ins
t
ead of git
init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-gi
t
:
rewri
t
e
"git-frotz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajn
a
hg-to-git: ab
o
rt
if
t
h
e project direct
o
ry i
s
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-t
o
-
g
it: avoid
r
a
i
s
ing
a
str
i
ng exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
INSTALL: Up
d
ate section about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos Vajna
R
etire 'stupid' merge strate
g
y
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case to en
s
ure gi
t
-
merge
r
educes
o
c
topus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Va
j
n
a
Add new t
e
st to
en
s
ure git-merge han
d
les more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next