repo.or.cz
/
git
/
gitbuild.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
add tests for merge message headings
2009-08-04
M
iklos Vajna
hg-to-g
i
t: don't import the
u
nu
s
ed popen2
mod
u
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
git-su
b
module doc
u
mentation: fi
x
f
o
reach
e
xam
p
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
M
i
klos Vajna
git-
s
vn documentati
o
n
: fix typo
i
n 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s
V
a
jna
refs: use wa
r
nin
g
() instead of
f
pri
n
t
f(stderr, "warn
i
ng: "
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
buil
t
i
n-sh
o
w-ref: use warning
(
) ins
t
ead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Va
j
na
builtin-
s
h
o
w-branch: use
w
arning() in
s
tead
o
f
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bui
l
tin-rm: use warn
i
ng() instead of
fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
ikl
o
s Vajna
bu
i
ltin-in
i
t-db: use
w
ar
n
ing(
)
instead of fprintf(stder
r
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-fetch-p
a
c
k: u
s
e warning(
)
i
n
stea
d
of fp
r
i
ntf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-check
o
u
t
:
u
se warning() instead
o
f f
p
ri
n
tf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
l
os Vajna
bui
l
t
in-apply: use warning() instead o
f
fprintf(std
e
rr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
ht
t
p-push: using error()
a
n
d
warning() as appropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Mi
k
los
Vajna
Tests: use test_cmp i
n
stead o
f
diff w
h
e
r
e possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklo
s
Vajna
p
a
rse-opt: migr
a
t
e
buil
t
in-ls-fil
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gittutorial
:
remov
e
misleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
iklos Vajna
Make
t3411 exec
u
table
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
f
ast-export: print usage when
no options
s
pecified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Mi
k
los
V
ajna
parse-
o
pt: migrate builtin
-
appl
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mi
k
los Vajna
t9129: sk
i
p the last three tests if U
T
F-8 lo
c
ale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPatches: mention th
e
usage of real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githo
o
ks
d
ocumentation: add a note about the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os Vaj
n
a
git-daemon documentat
i
o
n: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
iklos
Vajna
Add
s
u
p
p
o
rt for a pdf version
of the u
s
er m
a
nual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Mik
l
o
s V
a
jna
git
-
g
u
i
: Update
H
u
ngarian translation for 0
.
1
2
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c: use 'git_con
f
ig_string' to get 'curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos 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: use
g
it
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git rev-pa
r
se -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
ikl
o
s Vajna
lost-
f
ound: u
s
e gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
filter-bran
c
h: use git rev-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
git-stash: use
git
rev-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
M
i
klos
Va
j
na
Us
e
r's Manual: remove duplicated ur
l
at t
h
e end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin_cl
o
n
e
: use s
t
rbuf in c
m
d
_
clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
built
i
n-clo
n
e
: use strb
u
f in clone_local(
)
and copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s Vajna
builtin-cl
o
ne: use strbuf i
n
guess_d
i
r_n
a
me()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add new t
e
st
c
a
s
e to show fast-ex
p
ort does not
always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
builtin-branc
h
: use strbuf
i
n rename_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
uiltin-branch: use strbuf in fi
l
l_
t
r
acking_inf
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
kl
o
s
Vajn
a
bu
i
lt
i
n-branch
:
use
s
trbuf in
d
elete
_
branch
e
s()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Va
j
n
a
Update Hungarian translation
.
100% complet
e
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
g
it-remote
:
d
o
cume
n
t
the migration feature of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mikl
o
s Va
j
na
g
i
t-
r
emo
t
e rename: migrat
e
from re
m
ot
e
s/ an
d
br
a
nches
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklo
s
V
ajna
remote: a
d
d a new 'or
i
gin' variable to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
I
mplement git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklo
s
Vajna
updat
e
-ref --no-deref -d: h
a
n
dle
t
he case
when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos
Va
j
na
git branch
-m: for
b
id renaming of a sym
r
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Vajna
F
i
x git
u
pdate-
r
e
f --no-der
e
f -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rena
m
e_ref(
)
:
handle the case whe
n
th
e
re
f
l
o
g of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vaj
n
a
Fix git branch
-m
for
s
ymre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-opt: migra
t
e builtin-checkou
t
-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajn
a
Add testcase to ensure
merging a
n
ea
r
ly part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklo
s
Va
j
na
Add Linux PPC support to the
p
re-auto-gc e
x
ample hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib:
f
ix color reset in say_c
o
lor()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos V
a
jna
Imple
m
ent git cl
o
ne -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Clean
u
p
i
n
s
h
a1
_
file
.
c::cache_
o
r
_
un
p
ack_ent
r
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
b
u
iltin-co
m
mit: use reduce_heads() only when
a
ppropri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Vajna
builtin-merge:
refresh the index
b
e
f
ore ca
l
ling a
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
t760
3
:
a
d
d new testcases
t
o ensure
built
i
n-commi
t
u
s
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use commit_tree
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Vajna
commit_tree(): add a new
a
uthor parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: always us
e
tes
t
_
cmp inste
a
d of dif
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
built
i
n-merge:
r
elease the lo
c
k
f
ile in
try_merge_strategy
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
merge-recursiv
e
:
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-recursive:
move current_{f
i
le,director
y
}_se
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursiv
e
: move the globa
l
o
buf
to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
merge-recursive: get rid
of the index
_
only g
l
o
bal variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajn
a
merge-re
c
ursive: move call_
d
epth to struc
t
m
erge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
Mak
e
file: add
merge
_
recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
cherry-pick/revert: m
a
ke dir
e
ct intern
a
l call
to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
builtin-merge: avoid run_comm
a
n
d
_
v_opt()
for r
e
c
u
rsive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
mer
g
e-recursive: introduce merge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
kl
o
s Vajna
Split
o
u
t
m
e
r
ge_recurs
i
ve(
)
to merge-recurs
i
ve
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enable SNP
R
INTF_RETURNS_BOGUS for
H
P-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix '
g
it help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
Vaj
n
a
t9300: r
e
pl
a
ce '!' with te
s
t_mus
t
_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos V
a
jna
Docume
n
tation: document the pager
.
* c
o
n
f
iguration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
i
klo
s
V
ajna
Builtin gi
t
-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos
V
ajna
bui
l
tin-help: alway
s
load_comman
d
_
l
is
t
(
)
in
cmd_hel
p
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d
a
second testcase
f
o
r
h
andlin
g
i
nvalid strat
e
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new
t
e
s
t for using a cus
t
om merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
buil
t
in-merge: allow using a custom
s
t
ra
t
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
builtin-help:
m
a
ke some
i
nternal functions avail
a
ble
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t7601: extend the 'merge picks up the be
s
t res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a proper error message for i
n
valid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os Va
j
na
T
e
ach
'git merge'
that some me
r
ge
s
t
r
a
t
e
gies no long
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
ik
l
os Vajna
Add a new test for g
i
t
-
merg
e
-res
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
t6021: add
a
new test for git-merg
e
-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-dashes:
a
p
p
ly to
scripts and p
r
ograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s V
a
jna
git-b
i
sect
:
us
e
dash-less form on
g
i
t bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
los Vajna
t1007-ha
s
h
-object
.
sh:
u
se quotes f
o
r
the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t000
1
-in
i
t
.
sh: ch
a
nge
co
n
fusing director
y
n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajn
a
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
l
o
s
V
ajna
F
ix t7601-merge-p
u
ll-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos
V
ajn
a
g
it-commit-tree: make it usable from other builtin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
kl
o
s Vajn
a
Add new test case to
ensure git-merge
p
r
epends
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-gi
t
:
use gi
t
i
n
i
t inst
e
ad of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los V
a
jna
hg-to-git:
r
ewrite
"
g
i
t
-
frotz
"
to
"git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
to-git: abort
i
f
the p
r
oject
d
irectory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git: avoid raising a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
INSTALL: Up
d
at
e
secti
o
n abou
t
git-frotz for
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next