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 branch 'maint'
2009-06-30
M
iklo
s
Vajna
git-
s
ubmo
d
ul
e
documentation: fix foreac
h
exam
p
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklo
s
Vajna
git-svn documentation: fix typo in 're
b
ase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs:
use warning() instead of fprintf(std
e
r
r
,
"warning:
")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los
V
ajna
builtin-show-re
f
: us
e
wa
r
n
i
ng
(
) i
n
stead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-b
r
anch: u
s
e warning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-rm:
use wa
r
ning() instead of fprintf(
s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bu
i
ltin-i
n
i
t
-db: u
s
e warni
n
g
(
) ins
t
e
a
d o
f
fpr
i
ntf(st
d
err
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
b
u
i
l
tin-fet
c
h-pack:
u
se warning() instead of
fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builti
n
-checkout: use warning() instead o
f
f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
builtin-apply: us
e
war
n
ing
(
) instea
d
of fp
r
intf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
los
V
a
jna
http-p
u
s
h
: u
s
in
g
error() and
w
arning() as approp
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vaj
n
a
Te
s
t
s: use test_cmp ins
t
ead of diff
w
here possi
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos
V
ajna
parse-opt: m
i
grate builtin
-
l
s
-f
i
les
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gittutori
a
l: rem
o
ve misleading n
o
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos V
a
jna
Make t3
4
11
e
xe
c
utable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vaj
n
a
fast-expor
t
:
print
u
s
a
ge when no options spe
c
ified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
M
i
klos Vajna
par
s
e-opt: migrate
bui
l
tin
-
apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t9129:
skip the last three tests if UTF
-
8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos
Vaj
n
a
SubmittingPatches: ment
i
on the usage of real
n
ame in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githo
o
ks
documen
t
ation: ad
d
a note
a
bout the +
x
mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
los V
a
j
na
gi
t
-d
a
em
o
n do
c
umenta
t
io
n
: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vaj
n
a
Add suppor
t
fo
r
a pdf version of the user
m
anual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
g
it
-
gu
i
: Update
Hungarian
t
ranslation for 0
.
1
2
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Mi
k
los
V
ajna
http
.
c: use '
g
it_config_string' to get
'
curl_ht
t
p_proxy
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
submodule:
u
se gi
t
rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajn
a
rebase: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
p
u
ll: use
g
i
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
lost-found: use git
r
e
v
-pa
r
s
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajn
a
filter-branch: use git rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Vajna
g
it-stash:
u
se git rev-p
a
r
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
V
a
jna
Us
e
r's Man
u
al: r
e
m
o
ve du
p
licated url at
the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builti
n
_clone: u
s
e s
t
rbuf in c
m
d_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
kl
o
s Vajn
a
built
i
n-clone: use strbuf i
n
cl
o
n
e_local() and copy_or_
l
in
k
_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos Vajna
builtin-clon
e
:
use s
t
rb
u
f in gue
s
s_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vaj
n
a
Add new test
c
a
se to show f
a
st-export does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
uilti
n
-branch: use strb
u
f in renam
e
_branch(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s
Vajna
builtin-branch:
use strbuf
in
f
i
ll_tr
a
c
k
ing_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
los Vajna
builti
n
-b
r
a
nch: use strbuf
in de
l
ete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajn
a
Update Hun
g
arian
t
r
a
nslat
i
on
.
100
%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklo
s
V
ajna
git-remote: document t
h
e migratio
n
feature
o
f the
r
ename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
ik
l
os Vajna
git-remote re
n
a
me: mi
g
rate
f
rom
remo
t
es
/
and b
r
anches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos
V
a
jna
remot
e
: add
a
n
ew 'o
r
ig
i
n
'
v
ariable to the s
t
ruct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Implem
e
nt git rem
o
t
e
rena
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklo
s
V
ajna
updat
e
-ref --no-de
r
ef -d:
h
andle the case w
h
en the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklo
s
Vaj
n
a
git branch
-
m: forbid r
e
nam
i
ng o
f
a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Vajna
Fix git update-r
e
f --no
-
d
eref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_ref(): handle th
e
case when t
h
e reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
F
ix
g
it
b
ranch
-
m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-opt: migrate
b
uiltin-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
Vajna
Add
testc
a
s
e
to en
s
ure merging an e
a
rly pa
r
t of
a
branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
os Vajna
Ad
d
Li
n
u
x PPC supp
o
rt to
t
h
e
pre-auto-g
c
example
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
iklos
V
ajna
t
est
-
lib: fix color reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Implement
g
it clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos V
a
jna
Cleanup in
sha1_file
.
c:
:
c
ache_
o
r_u
n
pack_
e
n
t
ry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
built
i
n
-
commit: use reduce_heads() on
l
y whe
n
a
p
propriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajn
a
bui
l
tin
-
merge: r
e
f
resh th
e
index be
f
ore call
i
n
g
a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajn
a
t76
0
3: add new testcase
s
t
o ensure
builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s
Vajna
bui
l
tin-
c
ommit: use comm
i
t_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
commit_tree(): add a new auth
o
r par
a
meter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
ik
l
os Vajna
t7501: alway
s
use test_cmp in
s
tead
o
f
d
iff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
bui
l
tin-
m
e
r
ge: release the lockfil
e
in try_
m
erge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
merge
-
recu
r
siv
e
: get ri
d
of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los
V
aj
n
a
merge-recu
r
si
v
e: move c
u
rrent_{fil
e
,dir
e
c
t
ory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
jna
mer
g
e-recursive
:
mo
v
e the gl
o
b
a
l ob
u
f to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recursive: ge
t
rid of t
h
e inde
x
_only
glo
b
al va
r
iable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklo
s
V
a
jna
mer
g
e-recu
r
sive: move call_depth to struct me
r
ge
_
opti
o
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Make
f
ile: add mer
g
e_recursive
.
h to L
I
B_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry
-
pick/rever
t
: make direct internal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
builtin-merge: av
o
id r
u
n_comman
d
_
v
_opt() for
r
e
cur
s
ive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recursive: introduce
m
erge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out
merge_re
c
ursi
v
e(
)
to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Make
f
ile: enab
l
e
S
NPRINTF_RET
U
RNS_BOGUS for HP-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
i
klos Vajn
a
Fix 'git help
help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t930
0
:
r
ep
l
ace '!'
with
test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vaj
n
a
Doc
u
mentation: docu
m
e
n
t
the page
r
.
* confi
g
uration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
u
iltin git-he
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vaj
n
a
builtin-h
e
lp: always l
o
ad_co
m
mand_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
Add a second testca
s
e for handling invalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
Add a
n
ew test
for using a custom me
r
ge str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin-merge: a
l
low
u
s
ing a custom strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-
h
elp: make
so
m
e inte
r
na
l
functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7
6
01:
extend
the
'merge
p
ic
k
s up
t
he best
r
esult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
bui
l
t
i
n-m
e
rge: give a p
r
oper erro
r
mess
a
ge
for invali
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos Vajna
T
e
ach 'git merge' t
h
at som
e
m
erg
e
strategies no l
o
nger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
na
A
d
d a
new test
f
or
g
it-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
6
021: add a new t
e
st for git-merg
e
-reso
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-
d
a
s
h
e
s: apply to
scrip
t
s and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
git
-
bisect: use dash-less
f
orm on git bisec
t
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
t1
0
07-hash-
o
bj
e
ct
.
sh: use
q
uot
e
s
f
or
t
he test
de
s
cription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t0001
-
in
i
t
.
sh: change
c
onfusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build
i
n merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
l
os Vaj
n
a
Fi
x
t
760
1
-merge-pu
l
l
-
config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
git-commit-t
r
ee: mak
e
it usa
b
le from
o
ther built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Add new test case
t
o ensure git-merge pre
p
en
d
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-
g
it:
u
se git init ins
t
e
a
d of
g
i
t
init-d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
h
g
-
t
o-g
i
t:
r
ewrite "git-frotz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vaj
n
a
h
g
-to-git:
a
bort if the projec
t
dir
e
c
tory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avoid raising
a
s
t
ring exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
I
N
STALL: Update
s
ection abo
u
t git-frot
z
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Ret
i
re
'stu
p
id' merge st
r
ategy
commit
|
commitdiff
|
tree
next