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 'bg/maint-add-all-doc' into maint-1.6.5
2009-10-12
Miklos Vajna
gi
t
-stash documentation: mention
de
f
ault o
p
tio
n
s for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos
Vajna
git
b
r
anc
h
-D: give
a
bette
r
erro
r
m
essage
when
lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Mikl
o
s Vaj
n
a
git-
c
lo
n
e: add mis
s
ing co
m
ma in
-
-ref
e
r
ence documentation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Va
j
na
hg-t
o
-git: do
n
't import the un
u
sed p
o
pen2 mod
u
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
git-submodule documentation: f
i
x forea
c
h example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vaj
n
a
g
it-svn documen
t
ation: fix
t
y
p
o
in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos V
a
jna
refs:
u
se warn
i
ng
(
)
instead of
fprintf(st
d
err, "wa
r
n
i
ng:
"
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
b
u
ilt
i
n-show-ref:
use wa
r
ning() in
s
tead
o
f fprin
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
o
s Vajna
built
i
n-show-
b
ranch: use
w
arning
(
) i
n
stead
of
f
p
r
int
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
los Vajna
bu
i
ltin-rm: use warni
n
g() inste
a
d
o
f fprintf(s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-ini
t
-
db: use
warning() i
n
stead of fpr
i
n
tf(
s
tderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vajna
bu
i
ltin-fetch-pa
c
k: use
warning()
instead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los V
a
jna
builti
n
-che
c
kout: us
e
war
n
ing() instead
of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
builtin-apply: use warning() inst
e
ad of
f
printf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
htt
p
-
p
ush:
u
sing e
r
ror
(
) and warning() as appropr
i
a
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Tests: use
test
_
cm
p
instead
o
f
diff wh
e
re possi
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklo
s
Vajna
pa
r
se-
o
p
t
: mig
r
ate builtin-l
s
-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
M
i
klos Vajna
git
t
u
t
orial: remove misle
a
ding note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklo
s
Va
j
na
M
a
ke t3411
e
xecutable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-export: print usage when no options specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos V
a
j
n
a
parse-opt: migr
a
te
b
uiltin-app
l
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajn
a
t9129: s
k
ip the last three tests i
f
UTF-8 locale
i
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
os
Vajna
Submitt
i
ngPatches
:
me
n
tion the
u
sage of
r
e
a
l name
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks do
c
umentation
:
add a note about t
h
e +x
m
ode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos V
a
jna
g
it-daem
o
n documentati
o
n: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Mikl
o
s Vajna
Add support fo
r
a
p
df version o
f
the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vaj
n
a
git-gui: Update Hungarian tran
s
lat
i
o
n
fo
r
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vaj
n
a
http
.
c
:
use
'
g
it
_
config
_
strin
g
'
to get 'cur
l
_
h
t
t
p
_proxy
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
submodule:
use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Va
j
n
a
rebase: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
p
ull: use git
rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lo
s
t-f
o
u
n
d
: u
s
e git re
v
-pa
r
se
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-branch
:
use g
i
t rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git
-
s
tash: u
s
e git rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
V
ajna
User's Manual: remove d
u
plicated url
a
t the
end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bui
l
tin
_
clon
e
: use strbuf in cmd_cl
o
ne()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin-clone:
u
se strbuf i
n
clon
e
_local() an
d
copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bui
l
tin
-
cl
o
ne
:
use strbuf
i
n guess_dir_na
m
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos V
a
jna
Add n
e
w
tes
t
c
a
se to s
h
ow fas
t
-exp
o
rt does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos Va
j
na
bui
l
tin-branch: u
s
e s
t
r
b
uf in rename_bra
n
ch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los
V
a
j
na
builtin-branc
h
: use
strbuf
i
n
fill_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
b
u
iltin-branch: use strbuf in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos Vajna
Update H
u
ngarian t
r
anslation
.
10
0
%
c
omp
l
eted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mikl
o
s
V
aj
n
a
git
-
r
emote: document the mi
g
ration feature of
th
e
r
e
n
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
los Vajna
gi
t
-re
m
ote rename: migrate from
r
emotes/ and
branches
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
M
i
k
l
o
s
Va
j
n
a
remote: a
d
d a new
'
origi
n
' vari
a
ble to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Impl
e
ment git remote r
e
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
upd
a
te-ref --no-deref
-
d:
h
andle t
h
e
case whe
n
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
i
klos Vajn
a
git branch -m: forb
i
d
renaming of
a symr
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git update-ref --
n
o-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
renam
e
_ref(): handle
the cas
e
w
hen the r
e
flog o
f
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
Fix g
i
t branch
-m for sy
m
refs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklo
s
Vajna
parse-opt: migrate
b
u
i
ltin-
c
he
c
kout-ind
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klos Vajna
Add test
c
ase to ensure
m
ergi
n
g an early
p
art
of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux PPC support to
t
he
pre-auto-gc examp
l
e hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
i
klos Va
j
na
test-lib:
fix color rese
t
in say
_
col
o
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklo
s
Vajn
a
Implement git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos
V
a
j
na
Cleanup i
n
sha
1
_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-co
m
mit: use reduc
e
_heads() only whe
n
a
p
propriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mikl
o
s Vajna
b
u
i
l
tin-merge: refresh the ind
e
x
b
efore calling a strat
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t7603:
add new testc
a
ses to ensu
r
e bui
l
tin-commit us
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
o
s
V
ajna
builtin-co
m
mit: u
s
e commit_t
r
ee()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
commit_tree(): add a new author
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
t
7
501
:
a
l
ways use test_cmp i
n
stea
d
of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos
V
ajna
builtin-merge: re
l
ease the lockf
i
le
in try_mer
g
e_
s
trategy(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recurs
i
ve:
get
rid of vir
t
ual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recursive:
move
c
urrent_{file,dire
c
t
ory}_s
e
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
r
ge-recursi
v
e:
m
ove the global obuf to struct merge
_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos V
a
jn
a
me
r
ge-recursiv
e
:
g
et
r
id of the index_only g
l
obal variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s Vaj
n
a
merge-recursive:
mo
v
e call_depth to struct merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
Makefile: add m
e
rge
_
rec
u
rsiv
e
.
h to LIB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
ch
e
rry-pic
k
/
r
e
v
ert: make direc
t
internal call
t
o
m
erge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
buil
t
i
n-merge: avo
i
d run_
c
o
mmand_v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
m
erge-rec
u
rsive: introduce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os
V
ajna
Split out
merge_recu
r
sive() to me
r
ge-recurs
i
ve
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos
V
a
jna
Makefile: en
a
b
l
e
SNP
R
INTF_RET
U
RN
S
_BOGU
S
for HP-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
i
kl
o
s Vajna
Fix
'
git
h
elp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
iklos Vajna
t9300: repla
c
e '!' wit
h
test_must_
f
ail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentati
o
n: doc
u
me
n
t the pager
.
* configur
a
tion setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Vajna
B
u
iltin
git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-help: always
load
_
comma
n
d
_
list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a
s
e
c
o
n
d testcase for
han
d
ling invali
d
st
r
ategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
Add
a new test for using a custom merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
b
ui
l
tin
-
m
erge: all
o
w
u
s
ing a custom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
a
jna
bui
l
tin-help: make some inter
n
al functions a
v
a
i
l
a
ble
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601
:
extend the 'merge picks up
t
h
e best res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vajna
builtin-m
e
rge: give a proper error message
for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'gi
t
m
e
rge'
t
hat som
e
merg
e
str
a
tegi
e
s no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
ajna
Add a new test fo
r
git-merge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
los Vajna
t
6021: add a ne
w
t
est for
git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
m
a
ke rem
o
ve-dashes: apply
to s
c
r
i
pts a
n
d programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect:
use
d
ash-less
f
orm on git bi
s
ect l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
t
1
007
-
h
ash-obje
c
t
.
s
h: use
q
uotes
f
o
r
th
e
test d
e
scription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos
Vajn
a
t0001-init
.
sh: ch
a
nge
confusing
directory
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos V
a
jna
Build in m
e
rge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
kl
o
s
Vajna
F
ix t7601-mer
g
e-p
u
ll-config
.
sh
on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
V
ajna
git-commit-tree
:
ma
k
e
i
t usable from other buil
t
in
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
Add new
test case
t
o
en
s
ure git-mer
g
e prepends
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-
g
it:
use
git
i
nit instead
o
f git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to-git: rewrite "git-
f
rotz" to
"
gi
t
frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next