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 'master' into next
2009-09-03
Miklos
V
ajna
gi
t
-clone: add missing
c
omma in
--refe
r
en
c
e d
o
cu
m
e
n
tation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vajn
a
hg-to-git: don't
i
m
port the unused popen2
m
odule
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
git-submodule
d
ocumentation: fix fo
r
each
e
xample
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
git-svn documentati
o
n
:
fix typo in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos V
a
jna
r
efs: use w
a
r
ning() instead
o
f
f
p
r
intf(s
t
derr,
"
warning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Va
j
na
builtin
-
show-ref:
use
warning() inst
e
ad of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Va
j
na
bui
l
tin-show-br
a
nch
:
use warning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
buil
t
in-
r
m: use war
n
ing() in
s
tead
of
f
p
rintf(stde
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
l
o
s
Vajna
builtin
-
init-db: use warn
i
ng() i
n
stead of
f
pri
n
t
f(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vaj
n
a
builtin-fetch
-
pa
c
k: u
s
e w
a
rning() instea
d
of
f
printf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vajna
buil
t
in-checkout:
use
war
n
in
g
(
)
instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
bui
l
tin-apply:
u
se
w
a
r
n
i
ng() instead of fp
r
intf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http-push: using error() and
w
a
r
ning
(
) as appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Tests: use
t
es
t
_cmp
i
nstead of diff wher
e
possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos V
a
jna
par
s
e-op
t
: migrate builti
n
-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mikl
o
s
Vaj
n
a
gittutorial
:
r
e
move misleadin
g
n
ote
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Mi
k
los Vajna
Make t3411 execut
a
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-export: prin
t
us
a
ge
when
n
o
o
ptions s
p
ecified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos
V
ajn
a
parse
-
opt: mi
g
r
a
t
e b
u
i
l
tin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t9
1
29: skip the last th
r
e
e
tests if
UTF-8 loc
a
le is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
l
o
s Vaj
n
a
Subm
i
tti
n
gPatches:
m
ention the usage o
f
real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Va
j
na
gi
t
hooks
d
ocumentati
o
n
:
add a note
a
b
o
u
t the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Vajna
gi
t
-d
a
emon documentation: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajna
Add supp
o
rt
for a
p
d
f
ve
r
sion of the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklo
s
Vaj
n
a
git-g
u
i: Update
H
ungari
a
n trans
l
ation fo
r
0
.
1
2
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
Vajna
http
.
c:
u
s
e 'git_config_
s
t
r
in
g
'
to get
'
curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
ikl
o
s Vajna
subm
o
dule: us
e
git rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
r
e
base: use git rev-parse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use g
i
t rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
l
ost
-
found: u
s
e
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-branch: use git rev
-
parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
git-sta
s
h:
u
se git rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
V
a
j
na
User's
M
anual: remove
duplicated
url a
t
the end
o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klo
s
Vajna
built
i
n_clone: use st
r
buf i
n
c
md_c
l
one()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bui
l
tin-clone: use
s
t
r
buf in clon
e
_local() and c
o
py_
o
r_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
buil
t
in-c
l
one: use s
t
rbuf in guess_dir
_
name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklo
s
Va
j
na
Ad
d
new testcase to show fast-expor
t
does not alway
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vaj
n
a
bu
i
ltin-branch: use strb
u
f in rename
_
branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
bui
l
tin-branch: use s
t
rbuf in
fi
l
l_trac
k
i
ng_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Vajna
b
u
iltin-branc
h
: use st
r
buf
in delete_
b
r
a
nch
e
s()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Vajn
a
Update Hungarian t
r
anslation
.
100%
c
omple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
klos Vajna
g
i
t-remote: document the migration fea
t
ur
e
of the
r
enam
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vaj
n
a
g
it-remote rename: migrat
e
fr
o
m remotes
/
a
nd branche
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
remote:
a
dd a new 'origin' variable to th
e
s
truct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Imp
l
ement git remote
rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
update-re
f
--no-dere
f
-d: handle the ca
s
e when
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklo
s
Vajna
g
i
t br
a
nch -m:
f
orbid r
e
naming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
ajna
Fix g
i
t upd
a
te-ref
-
-
no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vaj
n
a
r
e
n
ame_ref(): handle the ca
s
e
when the reflog
o
f a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Vajna
Fix
g
it
b
ranch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mikl
o
s Vajna
p
a
r
se-opt: migrate builtin-ch
e
c
k
o
u
t
-
i
ndex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klos
V
a
jna
Ad
d
t
e
s
tcase to ensur
e
merg
i
ng an early par
t
of a
b
ran
c
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos Vajna
Add Lin
u
x PPC sup
p
ort
t
o th
e
pre-auto-gc exam
p
le ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
V
a
jna
t
e
st-lib: fix
c
olor reset
in say
_
colo
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
o
s
Vajna
Impleme
n
t
gi
t
clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup in sha
1
_file
.
c:
:
cache_or
_
u
n
pack_
e
ntry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-commit: use re
d
uce_heads()
o
nly when app
r
opriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mikl
o
s Vajna
builtin-m
e
rge: refresh the i
n
dex
b
e
f
o
re c
a
l
ling a
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t760
3
:
add new
t
e
stcases
t
o ens
u
r
e
builti
n
-c
o
mmit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
buil
t
in
-
commit: use c
o
mmit_tree
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
lo
s
V
a
jn
a
commit_tree(): add a new author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: always use test
_
cmp instead of
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos
Vajna
builtin-merge: release
t
h
e
l
ockfile
in try_m
e
rg
e
_
s
t
rate
g
y
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-recursive: ge
t
rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
a
jna
mer
g
e-r
e
cursive: mov
e
current_{file,dir
e
ctory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recurs
i
v
e
: move
the gl
o
ba
l
obuf to struct merg
e
_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
kl
o
s Vajna
merge-recursive: get rid
o
f the index_only global va
r
iable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
Va
j
na
m
erge-
r
ecur
s
i
v
e: move call
_
depth to
s
truct
m
er
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Va
j
na
Ma
k
efile:
add merge_recursiv
e
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pick
/
rever
t
:
ma
k
e direct inte
r
n
a
l call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
builti
n
-
merge: avoid ru
n
_comm
a
nd_v_
o
pt() for r
e
cu
r
sive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajn
a
merge-recursive: introduce merge_
o
p
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out merge_recursive
(
)
t
o
merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
Vajna
Ma
k
efile: enable SNPR
I
NTF
_
RETUR
N
S_BO
G
U
S
for
HP-U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mik
l
os
V
ajna
Fix 'g
i
t h
e
lp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
ajn
a
t9300: repla
c
e
'
!
' with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Va
j
na
Do
c
umentation: document t
h
e
pager
.
* c
o
nfiguration se
t
ti
n
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
V
ajna
Built
i
n git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mi
k
los Vajna
built
i
n-help:
a
l
w
ays loa
d
_command_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajn
a
A
d
d a
secon
d
testcase
for handling inv
a
lid s
t
rategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
Add a
new test for
using a custom me
r
ge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-merge:
all
o
w
using
a
c
u
stom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
builtin-help:
m
ake some
internal functions ava
i
lable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601
:
extend the '
m
erge
p
icks up the b
e
st
r
esul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos
V
ajna
builtin-merge: give a prope
r
error message
f
or
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vaj
n
a
T
e
ac
h
'git merg
e
'
that some merg
e
s
t
ra
t
egie
s
n
o
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
n
a
A
dd a new te
s
t for git-merge-reso
l
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a ne
w
t
est for g
i
t-m
e
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
V
aj
n
a
make r
e
move-dashes: ap
p
ly
to
s
c
ripts and
programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
git-bise
c
t:
use dash
-
less form on
g
i
t bisect
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t1007-hash-
o
b
ject
.
sh
:
u
s
e quo
t
es
for t
h
e test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
ik
l
os Vajna
t
00
0
1-init
.
s
h:
c
hange confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklo
s
Vajna
Build in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-merge-pu
l
l-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
Vajna
git-c
o
m
m
it-tre
e
: m
a
ke
it usable fr
o
m other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
dd new
t
est
case to ensure
g
it-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
git: use git ini
t
instead of git
i
nit-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g
-to-git: rew
r
ite "gi
t
-
frotz" to "git frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
l
o
s Va
j
na
hg-t
o
-git:
abort if the
p
roject di
r
ectory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s V
a
jna
hg-to-gi
t
: avoid rai
s
ing a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next