repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'bc/maint-am-email' into maint
2009-08-04
Miklos Vajna
hg-to-g
i
t
: don't
i
m
po
r
t the unused popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Mikl
o
s Vajn
a
gi
t
-submodule
document
a
tion: fix for
e
ach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vaj
n
a
git-svn do
c
ument
a
ti
o
n: fix
typo in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos
Vajna
refs: use warning() instead of f
p
rintf(s
t
derr, "warning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
u
iltin-show
-
ref:
u
se war
n
ing()
i
n
s
tead o
f
fprint
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos
V
ajna
builtin-show-branch: use warning()
instead of fpr
i
ntf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bui
l
t
in-rm:
u
se
w
a
r
ning()
i
nstead
o
f fprint
f
(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-init-
d
b: us
e
warning() instead of fprint
f
(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
builtin-fetch-p
a
c
k
: use warning() instead o
f
fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
u
iltin-checkout: use
war
n
ing()
i
n
stead of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos
Vajna
builtin-ap
p
l
y: u
s
e warni
n
g() instead
o
f
f
p
r
int
f
(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
h
t
tp-push: using error() a
n
d warning()
a
s a
p
propriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
M
i
k
los
Va
j
na
Te
s
t
s: use test_cmp inst
e
a
d of diff where possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajna
parse-opt: migr
a
te builtin
-
l
s-file
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vaj
n
a
git
t
utorial: remove m
i
s
l
eading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos
V
ajna
Make
t3411 executab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
M
iklos V
a
jna
fast-export: print
u
sag
e
whe
n
no op
t
i
ons s
p
e
ci
f
i
e
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Mikl
o
s
Vajna
parse-opt: migra
t
e builtin-app
l
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mikl
o
s Vajna
t9129:
s
kip the last
t
h
ree tests
if UTF-8 lo
c
ale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos V
a
jna
Su
b
mitt
i
ng
P
atches: mention
the
u
s
a
ge of real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Va
j
na
githoo
k
s documentation: add
a
n
o
te about
the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
V
ajna
git-daemon doc
u
m
e
nta
t
ion: use
{
t
ild
e
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Mi
k
los Vajna
Add support
for a pdf version of the user
m
anu
a
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos V
a
jna
git-
g
ui:
U
pda
t
e Hun
g
arian transl
a
t
i
on for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajn
a
http
.
c: use
'git_config_string' to get 'c
u
rl_
h
ttp_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
submodule:
use git
re
v
-parse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
rebase: use git rev-
p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pu
l
l
:
use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Va
j
na
lost-fo
u
nd: use git
r
ev-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajn
a
f
ilter-branch: u
s
e git
r
ev-p
a
r
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Vajna
g
i
t-
s
tash:
u
se
git r
e
v-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's Manua
l
: remov
e
d
upl
i
c
a
ted url
a
t
t
he end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
ajna
b
uiltin_clone: use strbuf in
c
md_cl
o
ne()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
los Vajna
builtin
-
clo
n
e:
u
se strbuf in c
l
one_local() and
copy_or_lin
k
_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin-clone: us
e
strbuf in gue
s
s_dir_na
m
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Va
j
n
a
Add
new testcase to
show
fast
-
export d
o
es not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
bu
i
l
t
in-b
r
a
n
ch: use strbuf in rename_branc
h
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
b
ui
l
tin-branch: use st
r
buf in f
i
ll_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch
:
use strbuf in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vaj
n
a
Update
Hunga
r
i
a
n tr
a
nslat
i
on
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
g
i
t
-r
e
m
o
te
:
do
c
ument the
migrati
o
n feature
o
f the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote rename: migrate fr
o
m
re
m
otes/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mik
l
os Vajna
remot
e
: add a new
'
ori
g
in' var
i
ab
l
e
to
the s
t
ruc
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
i
kl
o
s
Vajna
Impl
e
ment
g
i
t
remote r
e
n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
update-ref --no-deref
-
d
:
hand
l
e the case when th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branch -m: for
b
i
d renam
i
ng of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
j
n
a
Fix git upd
a
te-ref
-
-
n
o-
d
eref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
ren
a
me_ref(): hand
l
e the case when
t
he reflog of
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
Fix git branch -m fo
r
symref
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-opt: mig
r
ate bu
i
lti
n
-c
h
eckou
t
-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testcase
to ensur
e
merging a
n
e
a
r
ly part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux PPC support t
o
the pre-auto-gc example ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
te
s
t
-li
b
:
fix
color reset in sa
y
_col
o
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
Vajna
I
mplement git
c
lone
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
C
leanu
p
in
s
ha1_file
.
c::
c
ache_or_un
p
ack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os V
a
jna
builtin-c
o
m
m
it:
u
se r
e
duce_
h
ea
d
s() onl
y
wh
e
n appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
Vajna
builtin
-
merge: r
e
fr
e
sh the index before calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
na
t7603: add new
t
estcas
e
s t
o
ensure builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use commit_tr
e
e
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos V
a
jna
c
o
mm
i
t
_tree(): ad
d
a new a
u
thor parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
t7501
:
a
l
w
a
ys use t
e
s
t
_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
i
klo
s
Vajn
a
builtin-merge: r
e
lease the l
o
ck
f
i
le in try_m
e
rge_strate
g
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recursive: get ri
d
o
f v
i
r
tual
_
id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
rge-recursive: m
o
ve current_{file,direc
t
ory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
a
j
na
merge-r
e
cu
r
sive: move
the global obuf to struct me
r
ge_o
p
tio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
ik
l
os
Vajna
m
e
r
ge-recursi
v
e: get rid of the i
n
dex_only
g
l
obal variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajn
a
merg
e
-re
c
ursive: mo
v
e
call_depth to struct m
e
rge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
Makefile
:
add merg
e
_r
e
cursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
cherry-
p
ick/revert
:
make dir
e
ct internal
c
all to merg
e
_
t
ree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-
m
e
r
g
e: avo
i
d run_comma
n
d_v_opt
(
) for rec
u
rsive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
los
Vajna
merge-recursive: introduce merge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
Split out merg
e
_recursive() t
o
merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
ajna
Make
f
ile:
e
nable S
N
PRINTF_R
E
TURNS_BOG
U
S for
H
P
-U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos Vajna
Fix 'git hel
p
help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t
9300: replace '!' with te
s
t_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation:
d
ocument the p
a
ger
.
* config
u
ration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s Vajna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajn
a
builtin-hel
p
:
alwa
y
s load_comman
d
_
l
ist() in c
m
d
_
h
elp()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a sec
o
nd t
e
st
c
ase for h
a
ndling invalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a
new te
s
t
for using a c
u
sto
m
merge
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
ltin-merg
e
: allow u
s
ing a custom
strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin-
h
elp: make som
e
internal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t
7
601: exte
n
d
t
he 'merge picks
up th
e
best
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos
V
ajna
b
u
iltin-merge: 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
merge' t
h
at
s
ome merge s
t
ra
t
e
gies n
o
lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
l
os Vajna
Add a new test
f
or git-merge-
r
es
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
t
6021: add
a
n
e
w test
f
or gi
t
-merge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
m
a
ke re
m
ov
e
-dashes: apply to scrip
t
s and
p
r
o
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: us
e
dash-le
s
s form on
g
it bi
s
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007
-
h
as
h
-object
.
sh
:
use quot
e
s for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t0001-in
i
t
.
sh: change confusing d
i
rectory 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
Mikl
o
s Vajna
F
ix t7601-me
r
ge-pul
l
-c
o
nfig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os Vajna
git-commi
t
-tree: make it usable from other bu
i
ltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test case to
ensu
r
e g
i
t
-merge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-git: us
e
git init instead o
f
git ini
t
-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
kl
o
s Va
j
na
hg
-
to-
g
it: rew
r
it
e
"git-f
r
otz" to "git f
r
otz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: abort if the project dire
c
tory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
a
jna
hg-to-git: avoid ra
i
sing a
s
tring e
x
c
e
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTA
L
L: U
p
date section
about g
i
t-
f
rotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next