repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rj/maint-t9700' into maint
2009-10-12
Miklos Va
j
na
git-stas
h
d
o
cumentation:
m
ention de
f
ault opt
i
o
n
s for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Mik
l
os Vajna
git b
r
anch -D:
give a better error m
e
ssage
w
hen l
o
ckfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
M
i
klos
V
ajna
g
it-clone
:
add m
i
ssing comma i
n
-
-
referen
c
e documentation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Mi
k
los Vajna
h
g
-to-git
:
don't
i
mpor
t
the unused pop
e
n2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Mi
k
los Va
j
na
git-subm
o
dule d
o
cum
e
nt
a
t
i
on:
f
i
x
foreach
e
xample
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Mi
k
los Va
j
n
a
git-svn doc
u
menta
t
i
o
n: fix typo in '
r
ebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs:
u
se warning() inst
e
ad
o
f fp
r
intf(s
t
d
e
r
r, "
w
arning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
builtin-show-ref: use warning() i
n
stead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
a
j
na
builtin-show-branch: use war
n
ing() instead
o
f fpri
n
tf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
uilt
i
n-rm: use warning() instead o
f
fprintf(stde
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
builtin-in
i
t-db
:
use warning() instead of fprintf(stder
r
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
l
o
s Vajna
b
u
i
l
t
in
-
fet
c
h-pack: use warning() inst
e
a
d of
fpr
i
ntf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
n
a
bui
l
tin-che
c
ko
u
t
:
use warning()
i
ns
t
ead of fprint
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builtin
-
apply:
u
s
e
w
arning() instead
o
f fprintf(
s
td
e
rr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
h
t
tp-
p
ush: using error() and
w
arning() as appropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Test
s
: use test_
c
m
p
i
n
stead of diff where possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
M
i
k
los Vaj
n
a
parse-opt: mi
g
r
ate buil
t
in-
l
s-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklo
s
Vajna
gittut
o
rial: remove misleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
M
a
ke t3411 executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-export:
p
rint
usage w
h
e
n n
o
options s
p
ecified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
M
iklos Vaj
n
a
parse-opt: migra
t
e bu
i
lti
n
-a
p
ply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos
V
a
jna
t9129: skip
t
he last three t
e
s
t
s
if UTF-8
local
e
i
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
os Vajna
Submitti
n
gPatches: mention th
e
u
sage of rea
l
n
a
me in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajn
a
git
h
ooks doc
u
menta
t
io
n
:
a
dd a not
e
about the +x
m
o
d
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon documen
t
atio
n
: use
{
tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajna
Add sup
p
ort for a
pdf version of the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklo
s
V
a
j
na
git-gui: U
p
d
ate Hungarian translation
fo
r
0
.
1
2
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
V
a
jna
http
.
c
:
use 'git_config_string' to get 'curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule: use git rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
rebase:
u
se g
i
t rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Va
j
na
p
u
ll: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-fo
u
nd: use
g
it rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
l
os
V
ajna
filter-bran
c
h: u
s
e git rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
gi
t
-s
t
ash: use git rev-
p
a
rse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's
M
a
n
ual: remov
e
dupl
i
ca
t
ed u
r
l at t
h
e end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klos Vajn
a
bui
l
ti
n
_cl
o
ne
:
use strbuf in cmd_clone
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
V
a
j
na
bui
l
tin-clone:
u
se s
t
rb
u
f in
cl
o
ne_local() and copy_o
r
_
li
n
k_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bu
i
ltin-clone: use
strb
u
f in g
u
e
ss_dir
_
name
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mi
k
los Vajna
A
d
d new
t
estcase
t
o s
h
ow fast-exp
o
rt does not alw
a
ys
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
o
s Va
j
na
builtin-branch: use strbuf in ren
a
me_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Va
j
na
b
u
iltin-branch:
use strbuf in fill_
t
racking_info
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-br
a
nch: use strbuf in d
e
l
ete_bran
c
hes
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
ik
l
os
V
ajna
Update Hungarian tra
n
s
l
ation
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote
:
doc
u
ment
t
he migration feature of
the renam
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
klos Vajna
git-remote rename:
m
igrate from remot
e
s/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
M
i
k
los Vajna
remo
t
e: add
a
new 'origin' variable to th
e
struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Va
j
na
I
mp
l
ement gi
t
remote ren
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos
Vajna
update-ref --
n
o-
d
eref -d: handle t
h
e ca
s
e wh
e
n the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mikl
o
s V
a
jna
g
i
t branch -m: forbid renami
n
g o
f
a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix
g
it u
p
date
-
ref --no-de
r
ef -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
ren
a
me_r
e
f(): handl
e
the case when the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Va
j
na
Fix git branch -
m
for
s
ymrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
M
i
klos Vajna
parse-opt: migrate builtin-checkout
-
index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klos Vajna
A
d
d testcase t
o
e
nsure merg
i
n
g
an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux PPC
s
upport to the pre-aut
o
-gc example h
o
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
i
klos V
a
jna
test-lib: fix colo
r
reset
i
n say_col
o
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
os Vajna
Imple
m
e
nt g
i
t
clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
Vaj
n
a
Cleanup in sha1
_
file
.
c::
c
ache_or_unpac
k
_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os V
a
jna
builtin-commit: use reduce_hea
d
s() on
l
y wh
e
n appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
bui
l
tin-m
e
rg
e
:
re
f
resh the index before callin
g
a strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s
Vajna
t7603: add
new testcas
e
s to ens
u
re builtin-comm
i
t use
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajn
a
bu
i
lt
i
n
-com
m
it: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
commit_tree(): a
d
d a new autho
r
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
t7501:
a
lways use te
s
t_c
m
p instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
builtin-m
e
r
g
e:
release the lockfile in tr
y
_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vaj
n
a
merge
-
re
c
ursive: get
rid of virtua
l
_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
merge-recursive: move current_{file,
d
irectory}_
s
et
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
n
a
merg
e
-recursiv
e
:
m
ove the global obuf to struct me
r
ge_op
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merge-recursive: get rid of the index_onl
y
global variab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos V
a
j
n
a
merge-r
e
cursiv
e
: move call_depth to s
t
ruct
m
er
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: add m
e
rge_re
c
ursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Va
j
na
cherry-
p
ick/revert: make direc
t
in
t
ernal
c
a
ll
to m
e
r
ge_tre
e
(
)
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
b
u
i
lt
i
n
-
merge:
a
void run_command_v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
merge-recursive: intro
d
uce merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os
V
a
jna
Sp
l
it out me
r
ge_
r
ecursive() to merge-recursiv
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
a
jna
Makefile
:
e
n
a
b
l
e SNPR
I
NTF_RETURNS_BOGUS
for
H
P-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git help help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
Vajn
a
t
9
300: rep
l
ace '!' with
test_must_fa
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
o
s
Vajna
Documentation: docu
m
ent
the page
r
.
*
c
onfiguration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
Vajn
a
Buil
t
in
g
it-h
e
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajn
a
builtin-help: always load_command
_
lis
t
(
)
in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
Add a s
e
cond testcase for handling invalid strate
g
ie
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
ikl
o
s Va
j
na
Add a
n
ew test for
u
s
i
n
g a c
u
s
t
o
m merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
l
os
V
ajna
builtin
-
m
e
r
ge: allow using a cus
t
om strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
u
iltin-help: make some internal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
ajna
t7601:
extend the
'
m
erge picks u
p
the best
r
esult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s
V
ajn
a
builtin-merge: gi
v
e a
prope
r
e
r
ror message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vajna
Tea
c
h 'git
merge
'
th
a
t some merge strategies no
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajna
Add a new te
s
t for gi
t
-me
r
ge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
t6
0
21: add a new test for git-
m
erge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
V
ajna
m
a
k
e remove-dashes: apply to scripts and
p
r
ograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
g
it-bis
e
ct
:
use dash-less form on git bisect
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
1
007-hash-o
b
ject
.
sh: us
e
quotes for th
e
test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os
V
ajna
t
0
001-ini
t
.
sh:
ch
a
n
ge conf
u
sing di
r
ectory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
ld
i
n me
r
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los
Vajna
F
i
x
t
7601-merge-pull-
c
onfig
.
s
h
o
n
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-com
m
it-tree: make it
u
sable from other bui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
lo
s
Vajna
A
d
d n
e
w test case to ensure git-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
Vajna
hg-
t
o-git: use
git
i
n
it instead of
git i
n
it-d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
h
g
-to-git
:
re
w
rite
"
git-frotz" to "g
i
t frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next