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-06-30
M
iklos Vajna
git-submodule documentat
i
on: fix foreach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
M
iklo
s
Vajna
git-svn documentation
:
fix typo in 'reba
s
e vs
.
p
ull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs: use w
a
rning() instead of fprintf(std
e
rr,
"warni
n
g: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s V
a
jna
b
uiltin-show-ref: u
s
e warning() instea
d
of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
buil
t
in-sho
w
-br
a
n
c
h
:
u
s
e
w
arning() instead of fpr
i
n
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
builti
n
-rm: us
e
w
a
rning()
i
nstead
o
f fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
builtin-init-db:
u
s
e warning() in
s
t
ead of fpri
n
tf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
builtin-fetch-pac
k
: use warnin
g
()
instead of
f
printf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
builtin-c
h
eckout:
use warnin
g
(
)
inst
e
ad of
f
p
r
intf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-apply: use war
n
i
n
g() inste
a
d of fprintf(s
t
der
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
h
t
tp-push: usin
g
e
rror() a
n
d warning
(
) as ap
p
ropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Tests: use tes
t
_cmp
i
ns
t
ead of
d
i
f
f where possib
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mikl
o
s V
a
jna
p
a
rse
-
o
p
t
:
migrate bu
i
ltin-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos
V
ajna
gi
t
tuto
r
ial:
r
emove mis
l
e
ading not
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
M
ake
t3411
executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
M
iklos Vajna
fast-
e
xport:
print usage when
n
o optio
n
s specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos
Vajna
parse-o
p
t
: m
i
grate
b
uiltin-app
l
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mi
k
los Vajna
t912
9
: s
k
ip th
e
l
a
s
t thre
e
tes
t
s
if UTF-8 local
e
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
M
ik
l
os Vajna
Submittin
g
Patches: mention the
u
sage of real name
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos
Vaj
n
a
githooks documentation:
add
a
not
e
about th
e
+x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon do
c
u
me
n
tation: use
{
ti
l
de}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos
V
ajna
Add suppo
r
t for a pdf version
o
f t
h
e user ma
n
ua
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-
g
ui
:
Upd
a
te
H
u
ngaria
n
trans
l
ation fo
r
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Mi
k
los Vajna
http
.
c: us
e
'git_config_string' to get
'
cur
l
_http_prox
y
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
submodule: u
s
e git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
o
s
Vajna
reba
s
e: 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
pul
l
: use git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajn
a
l
os
t
-f
o
und: use git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-branc
h
: use git rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stash: use g
i
t rev-p
a
rse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mi
k
los Vajna
User'
s
M
a
n
ual: rem
o
ve duplicate
d
url
a
t
the
end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
builtin_clone: use
strbuf in cmd_clon
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jn
a
b
u
iltin-clone: use strbuf
in clone_local() and copy_or_li
n
k
_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bui
l
tin-c
l
one: use strbuf in gu
e
ss_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos
V
ajn
a
Add new te
s
tc
a
se t
o
show
f
a
s
t
-
e
xport does n
o
t
a
lways
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
builtin-b
r
anch
:
u
s
e
s
trbu
f
in rena
m
e_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
b
uiltin-branch: us
e
s
t
r
b
u
f
in fill_
t
racking_inf
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
b
uiltin
-
branch:
u
se
st
r
bu
f
in delete
_
br
a
nches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Va
j
na
Up
d
ate Hungarian transl
a
t
ion
.
1
00%
c
ompleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
los Vajna
git-r
e
mote:
d
ocu
m
e
n
t
the migrat
i
on feature of the r
e
name
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remot
e
renam
e
: migra
t
e
from remotes/ and branches
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos
V
ajna
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
I
m
p
lement g
i
t rem
o
te rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Mi
k
los Vaj
n
a
u
p
date-r
e
f --no-d
e
r
ef -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 V
a
jna
git bra
n
ch -m: forbid renaming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vajna
Fix git update-ref -
-
no-de
r
ef -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vajna
re
n
ame_ref(
)
: h
a
ndle th
e
case
w
h
en t
h
e reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
F
i
x
gi
t
b
ranch
-m for
symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
pa
r
se-op
t
:
m
i
grate builti
n
-checko
u
t-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
ajna
Add testcase to ensure mergin
g
an early
p
art of a branc
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
d
d
L
inux PPC
support to the pre-auto-gc
e
xample hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos V
a
jna
test-lib: fix colo
r
reset
in say_col
o
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s
Va
j
na
Im
p
lement
g
it clo
n
e -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup in sha1_file
.
c::
c
a
che_
o
r
_unp
a
ck_entry
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin
-
commit: use redu
c
e_heads() only
w
hen app
r
opri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Va
j
na
builtin-merge: refresh
t
he
i
ndex before c
a
lling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajn
a
t7603
:
add n
e
w testcases to ensure built
i
n-commi
t
uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Vajna
builtin-commit: use commit_tr
e
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
c
ommit_tr
e
e(
)
: add a new
au
t
hor parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vaj
n
a
t
7501: always use test_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mikl
o
s V
a
j
na
builtin-merge: re
l
ease
t
he lockfile in tr
y
_me
r
ge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erg
e
-recu
r
s
i
ve: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
me
r
ge-rec
u
rsive: move curr
e
nt_{file
,
dire
c
t
ory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
m
e
rge-recur
s
iv
e
: move the global o
b
uf
to
struct m
e
rge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Va
j
na
merge-
r
ecurs
i
ve:
g
et
r
id
o
f
the index
_
onl
y
globa
l
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recursive: m
o
v
e
c
all
_
d
epth
t
o struct
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
M
a
kefile: add me
r
ge_
r
ecur
s
iv
e
.
h to LIB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vaj
n
a
cherry
-
pick/revert
:
m
ake
d
irect
internal call to m
e
rg
e
_
tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
b
u
il
t
i
n-merge:
avoid run
_
command_v
_
opt() for r
e
cursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
kl
o
s Vajna
merge-recursive: i
n
trod
u
c
e
merge
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos
V
ajna
Split
o
u
t merge_recursive() to merge-recur
s
ive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Va
j
na
Makefile:
enable SNPRINTF_RETURNS_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
F
i
x 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
iklos Vajna
t9300: r
e
place '!
'
with test_must_f
a
il
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docu
m
enta
t
ion:
do
c
u
ment the page
r
.
* c
o
nfigurat
i
on
setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s
Vaj
n
a
Builti
n
g
i
t-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Va
j
na
built
i
n-help: always load_command_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d a secon
d
te
s
tcase
f
or
h
a
ndling invalid
s
tr
a
tegies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklo
s
Vaj
n
a
Add a new test for using a cust
o
m mer
g
e stra
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
n
a
builtin-mer
g
e: al
l
ow using a cust
o
m strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos
V
ajna
builtin-hel
p
: make som
e
i
n
ternal functio
n
s available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend the '
m
erge picks up the bes
t
r
e
sult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Vajna
bui
l
tin
-
merge
:
g
i
ve a pr
o
per error message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os Vajna
Teach 'git mer
g
e'
t
hat
s
o
me mer
g
e
s
t
rategies no
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
Add a new tes
t
for git-mer
g
e-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
l
os Vajna
t6021: add
a new test for
g
it-merge
-
resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
Vajna
make
r
emove-d
a
shes: ap
p
ly to scripts and programs
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vaj
n
a
git-bi
s
e
c
t:
u
se
dash-less form on git
bisect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t1
0
07-
h
ash-object
.
sh: use quotes f
o
r
t
he test descri
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0001-init
.
sh: change
c
onfusing directory
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in merg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
Fix t7601-merge-pull-config
.
sh on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
git-commit-t
r
e
e: make
i
t usab
l
e f
r
o
m
other
b
uiltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
kl
o
s Vajna
Ad
d
new test case to ensur
e
g
i
t-
m
er
g
e
p
repends
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
h
g
-to-g
i
t: use git init instead
o
f g
i
t init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-t
o
-gi
t
: rewrite "git-f
r
otz" to "git
f
r
o
tz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
hg
-
to-git: abort
i
f th
e
project directo
r
y is n
o
t a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to
-
git: av
o
id
raising a
s
t
ri
n
g exce
p
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os
Va
j
n
a
INSTALL: Update section about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vaj
n
a
Retire
'
stupid' merge strategy
commit
|
commitdiff
|
tree
next