repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Grammar fix for "git merge" man page
2009-03-24
M
iklos
V
a
jna
refs: use war
n
ing
(
) instead of fprintf(stde
r
r, "warning:
")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos Vajna
builtin-show-ref: use w
a
r
n
ing()
inst
e
ad of
f
printf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
builtin-
s
how-branc
h
: use
warn
i
ng() instead of fprin
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
b
u
i
l
tin-rm: use warning() ins
t
ead o
f
fp
r
intf(st
d
err
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
o
s
Vajna
bu
i
ltin-init-db: use wa
r
ning() i
n
stead o
f
fpr
i
ntf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vajna
builtin-fetch-pack:
u
se warning() ins
t
ea
d
of fprint
f
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
builtin-checkout: use warn
i
ng() instea
d
of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vaj
n
a
bu
i
ltin
-
appl
y
: use wa
r
ning()
i
nstead of
f
printf(stde
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os
V
aj
n
a
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
Mi
k
los
V
ajna
Te
s
ts:
use tes
t
_cmp
instead
o
f diff
whe
r
e p
o
s
s
ible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajna
pa
r
se-op
t
: mig
r
ate builtin-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mi
k
los Vajna
gittutorial:
remove misleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vaj
n
a
Make t34
1
1
execut
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-export: print usage when no option
s
specifie
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
pars
e
-
o
p
t:
m
igrate builtin-appl
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mikl
o
s Vajna
t
9129: skip th
e
last three
tests if UTF-8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajn
a
Submitt
i
ngPa
t
ches: mention
t
he u
s
a
ge of real name
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s
V
a
jn
a
g
i
t
h
ooks d
o
cumentation:
add a note about the +x
m
ode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
ik
l
os Vajna
git-daem
o
n d
o
cu
m
e
ntation
:
use
{
tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Mik
l
os Vajna
Add
s
up
p
ort fo
r
a
pdf
v
e
r
sio
n
of the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Va
j
n
a
g
it-gui: Update Hungarian t
r
anslation for
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Mikl
o
s Va
j
na
h
t
tp
.
c:
use
'
git_config
_
string' to ge
t
'curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
s
ub
m
odule: use git rev-parse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase: use git rev
-
pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull
:
u
s
e gi
t
re
v
-pars
e
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vaj
n
a
lost-found: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
filter-b
r
anch: u
s
e g
i
t rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stash: use gi
t
rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
M
i
klos V
a
j
n
a
Use
r
's Manual
:
remove dup
l
icate
d
url
at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Va
j
na
b
u
iltin_clone
:
use s
t
rbuf in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
ajna
b
u
ilti
n
-clone:
use strbuf in clone_loca
l
(
)
and c
o
py_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin-clone
:
use strbuf in guess_di
r
_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
A
d
d new testc
a
se to show fas
t
-export doe
s
n
ot alwa
y
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
uiltin-branch: u
s
e strbuf i
n
r
e
n
ame_
b
ranch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s
Vajna
bu
i
ltin-b
r
anch: use
strbuf in fill_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
builtin
-
branch: use strbu
f
in
dele
t
e_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
o
s Vajna
Update
Hun
g
aria
n
tra
n
slation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos
V
ajna
git-remote: document the migration fe
a
ture
of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
g
i
t-remote
r
ename: m
i
gr
a
te fr
o
m remotes/
a
nd bra
n
ches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Va
j
na
remote: add
a new 'origin
'
variable to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajn
a
Im
p
lement git remote
r
en
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
update-ref --no-deref -d: han
d
le
the
case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
i
klos Vajna
g
it branch -m: f
o
rbid renaming
o
f a sy
m
ref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
F
ix git
u
p
d
a
te-ref --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_ref(): handle th
e
cas
e
when the reflo
g
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
Fix git branch -m f
o
r symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mi
k
los
V
ajna
parse-opt: migrate builtin-chec
k
out
-
index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos Vaj
n
a
Add te
s
tc
a
s
e to ens
u
re merging an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
ajna
Add Linu
x
PPC support to th
e
pre-a
u
to-gc ex
a
mple hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
tes
t
-lib: fi
x
color
r
e
s
et
i
n
say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Vajna
Imp
l
e
m
ent git clo
n
e -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s
V
ajna
C
l
eanup in
sha1_fil
e
.
c::c
a
che
_
or_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
Vajna
builtin-com
m
i
t:
u
s
e reduce_heads() only when app
r
opri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
Vajn
a
buil
t
in-m
e
rge: refresh the index before calling a st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Vajna
t7603: add new te
s
tcases to ensure builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
bu
i
ltin-
c
ommit: use c
o
mmit_tr
e
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Vajn
a
commit_t
r
ee
(
): add a new
a
u
tho
r
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: always
u
se
test
_
c
m
p instea
d
of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
iklos Vajna
built
i
n-merge: release
t
he lockfile in
tr
y
_merge_str
a
t
eg
y
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vaj
n
a
m
e
rge-recursive:
g
et rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-recursi
v
e
:
move current_{file,director
y
}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Va
j
n
a
merge-recursive: move the global obuf to
struct
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
merge
-
recu
r
si
v
e:
g
et rid
of the
in
d
ex_o
n
ly g
l
obal variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Va
j
na
merge-recursive: move ca
l
l_depth to st
r
uct
m
erge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
Makefi
l
e: add mer
g
e_recurs
i
ve
.
h to LIB_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pick/re
v
ert: make d
i
rect internal
c
all to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: av
o
id r
u
n_command_v_opt() for re
c
ursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
merge-recur
s
ive: introduce me
r
ge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
Split o
u
t merge_r
e
cursiv
e
() to merg
e
-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
iklos Vajna
Makefil
e
: ena
b
le SNPRINTF_RETURNS_BOGUS f
o
r
HP-U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajn
a
F
i
x 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Va
j
na
t9300: r
e
p
l
ac
e
'!' with
test_m
u
st_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
D
o
cumentation:
doc
u
ment
the
p
ag
e
r
.
* conf
i
guration s
e
tting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
iklos Vajna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mi
k
los Va
j
na
b
ui
l
tin-help
:
always lo
a
d_command_
l
ist
(
) in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vaj
n
a
Add
a second testcas
e
f
o
r handling inval
i
d s
t
rateg
i
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
Add a new test for using a cust
o
m
m
erge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
built
i
n
-merge: allo
w
using
a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s
V
ajna
builtin
-
help
:
make some internal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t
7
6
0
1: extend the 'me
r
ge picks up the best r
e
s
ult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mikl
o
s
Vajna
b
uiltin-merge: give a proper error m
e
ss
a
ge for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
M
ik
l
os Vajna
Te
a
ch 'gi
t
merge' that
s
om
e
me
r
ge strategies no lo
n
g
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new test f
o
r
git
-
m
e
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
a
j
n
a
t
6
021: add
a
n
e
w
t
e
st for
g
it-
m
e
r
ge-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vaj
n
a
m
ake remove-da
s
h
e
s
: apply to
s
c
ripts and
p
rograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
git-bisect: use da
s
h-less form on git bisect
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash
-
object
.
s
h
: u
s
e
q
uotes for
t
he tes
t
descr
i
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
los Vajna
t0001-ini
t
.
sh: c
h
ange confus
i
ng
d
irectory
n
am
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
V
a
jna
Build in
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix
t
7
601-merge-pull-conf
i
g
.
s
h
on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
git-commit-tree:
m
ake
it usable from o
t
her builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new te
s
t case to
ensure git-mer
g
e
pre
p
ends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vaj
n
a
hg-
t
o-g
i
t: use git init
i
nstead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to
-
g
i
t: rewrite "git-frotz
"
to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
it: abort
if
the project d
i
rectory i
s
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg-to
-
git: avoi
d
rai
s
ing a stri
n
g exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
I
NSTALL:
U
pdate section about git-fro
t
z form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Retire 'stupid' mer
g
e strategy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
A
dd new test
c
a
s
e to ensure git-merge reduces o
c
t
opus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to en
s
u
r
e git-merge handles mor
e
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next