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 'maint-1.7.0' into maint-1.7.1
2010-07-13
Mik
l
o
s
Vaj
n
a
form
a
t-patch: doc
u
ment the format
.
to c
o
n
fig
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
M
i
kl
o
s
Vaj
n
a
request-pul
l
: avoid mentioning that the start point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Mi
k
los Vajna
gitk: Upda
t
e Hungarian translatio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
M
ik
l
os Vajna
D
ocument date for
m
a
t
s accepted by parse_date()
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
builtin-c
o
m
m
i
t
: add --date op
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos Vajna
g
it-stash documentation:
m
ention default o
p
tions for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos
Vajna
git branch -
D
: giv
e
a b
e
t
ter
erro
r
m
e
ss
a
ge when lockfil
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklos Vajna
git-clon
e
: add missing
comma i
n
--reference documentation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
M
ikl
o
s Vajna
hg-to-git: don't imp
o
r
t t
h
e
u
nused pope
n
2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
M
i
klos V
a
jna
git-su
b
mod
u
le docume
n
tation: fix
foreach e
x
amp
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Mik
l
o
s
Vajn
a
git-svn do
c
umentatio
n
: fix typo in 'reb
a
se vs
.
p
u
ll
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs: use
w
arning()
inst
e
ad of
fprintf(stderr, "warning:
"
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
built
i
n
-
show-ref
:
u
se warnin
g
() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vajna
bui
l
tin-show
-
b
r
a
n
ch: use warning() inst
e
ad o
f
fprint
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vajn
a
builtin-rm: us
e
warning(
)
instea
d
of fprin
t
f(
s
tderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Va
j
n
a
builtin
-
init-db
:
us
e
wa
r
ning
(
)
instea
d
of fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
builtin-fetch-pack: use warnin
g
() inste
a
d
of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-ch
e
ck
o
ut: use warn
i
ng(
)
inste
a
d of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-apply: use
warn
i
ng() instead
of fprintf(st
d
er
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklo
s
Vajna
http-push: using error(
)
an
d
warnin
g
() as appropriat
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos V
a
jna
Tests: use
t
e
st_cmp instead of dif
f
where poss
i
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajn
a
parse-op
t
: migra
t
e buil
t
in-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mik
l
os Vajna
gitt
u
tori
a
l: remove mis
l
ea
d
ing note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
Make t3411 exec
u
table
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklo
s
Va
j
n
a
fast-export:
p
r
i
nt us
a
ge
w
hen no options specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
pars
e
-
opt: migrate builtin
-
apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
M
iklos Vajn
a
t9129:
skip the l
a
st three tests if UTF-8
l
ocale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos
V
ajna
Subm
i
tti
n
gPatches:
m
ention the usage of real n
a
me in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
Vajna
git
h
ooks documentation: a
d
d a note
ab
o
ut the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
Vajna
git-daemon
docum
e
ntatio
n
:
u
se {tilde
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos V
a
jna
Add s
u
ppor
t
f
or a pdf v
e
rsion of th
e
use
r
manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajn
a
git-gui: Update Hungar
i
an
translation for
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos V
a
jna
http
.
c:
us
e
'git_config_string' to ge
t
'
c
url_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
s
u
bmo
d
u
l
e:
u
se git r
e
v-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajn
a
rebase: use g
i
t rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
p
ul
l
:
us
e
git rev-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
lost-found:
use gi
t
rev-pa
r
se
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
fi
l
ter-branch: use g
i
t rev
-
par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
g
it
-
sta
s
h:
use git rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vaj
n
a
U
s
er's Ma
n
ual: re
m
ove dupli
c
ated url at the
end o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin_clone: use
strbu
f
in cmd
_
c
lone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
k
l
os Vajna
bu
i
l
tin-clon
e
: use
s
trbuf i
n
clo
n
e_local() and cop
y
_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jna
builtin-clone: use
strbuf in gues
s
_dir
_
name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mi
k
lo
s
Va
j
na
Add new
t
estcase to sh
o
w fast-export does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch: u
s
e
strbuf in rename_bran
c
h()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
a
jna
builtin-branch:
use strbuf in f
i
ll_
t
racking_
i
nfo(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
l
o
s
V
ajna
builtin-bran
c
h: us
e
strbuf in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vaj
n
a
Update Hungarian
t
r
a
nsla
t
ion
.
1
0
0% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
ik
l
os Vaj
n
a
g
i
t-remote: d
o
cument th
e
migration feature of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
iklos Vaj
n
a
git-remote
r
ename: m
i
g
r
a
t
e from remote
s
/ and br
a
nch
e
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajn
a
remote: add a
new 'orig
i
n' v
a
riable to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mikl
o
s Vajna
I
mplem
e
nt git
r
e
mote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Mi
k
los Vajna
upd
a
te-ref --n
o
-deref -d: handle the case
w
hen
t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
iklos Vajn
a
git br
a
nch -m: forbid renaming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
l
os Vaj
n
a
Fix git update-ref
--no-de
r
e
f
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
rename_r
e
f(): handle
the case whe
n
the ref
l
og of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s
Vajna
Fix git b
r
anch -m for symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklo
s
Vajna
parse-o
p
t
:
migrate b
u
iltin-check
o
ut-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testcas
e
to en
s
ur
e
me
r
ging an e
a
rly pa
r
t of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
os Va
j
na
Add
L
inux PP
C
support t
o
the p
r
e
-
auto-gc
e
xampl
e
ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-li
b
: fix color r
e
set
in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos
V
ajna
I
m
pl
e
ment git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup in s
h
a1_file
.
c:
:
cac
h
e_or_unpac
k
_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Vajna
buil
t
in-commi
t
: use reduce_heads() on
l
y when ap
p
ropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os V
a
j
na
bui
l
tin-m
e
rge: refresh the
i
ndex before
calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajn
a
t7603: a
d
d
new testca
s
es to ensure builtin
-
commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos
Vajna
builtin-commit: use
c
ommit_
t
ree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Va
j
n
a
commi
t
_tree(): ad
d
a new author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
t7501: always use
t
est_cmp instead of d
i
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
built
i
n-merge: release
the
lockfile
i
n try_merge_st
r
ategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajn
a
merge-recursive: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Va
j
na
m
erge-r
e
cur
s
ive: move current_{file,
d
i
r
e
c
tor
y
}_se
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
jna
merge-
r
ecursive: mo
v
e the gl
o
bal obuf
t
o struc
t
merge_
o
pt
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Va
j
na
m
e
r
ge-recurs
i
v
e: get rid of t
h
e index_only gl
o
bal va
r
iable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
i
klos Vajna
merge-rec
u
r
s
ive:
m
o
ve call_depth to s
t
ruct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
los Vajna
Mak
e
f
ile: add merge_recu
r
sive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os Vajna
c
h
erry-pick/revert: ma
k
e d
i
rect internal call
t
o mer
g
e
_
t
ree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-
m
erge: avoid r
u
n_command_v_opt() for recur
s
iv
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
merge-recursive: introduce
m
erg
e
_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
Spl
i
t
out
m
e
rge_re
c
ursiv
e
(
) t
o
merge-r
e
cur
s
ive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s Vajna
Makefile:
e
nab
l
e SN
P
RINTF_RETUR
N
S
_BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Va
j
na
Fix '
g
it help
h
elp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mikl
o
s Vaj
n
a
t9300: replace '!' wit
h
tes
t
_must_f
a
il
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los Vajna
Documentation: document the pager
.
* configu
r
ation set
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin git
-
help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mikl
o
s V
a
jna
bui
l
tin-help: al
w
a
ys
lo
a
d_command_list() in cmd_help
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a se
c
ond testcase for
h
andling
invalid strat
e
gi
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new te
s
t for usin
g
a c
u
sto
m
merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
built
i
n-mer
g
e: allow using
a
c
ustom s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Va
j
na
built
i
n-
h
elp
:
make some
i
nternal
functions
avail
a
b
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: e
x
tend the '
m
erge picks up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Va
j
na
builtin-merge:
give a proper
e
r
r
or m
e
s
s
age fo
r
invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
T
each
'
git merg
e
' that some me
r
g
e
st
r
ate
g
i
es no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
o
s
Vajna
Ad
d
a new t
e
st fo
r
git-mer
g
e-
r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021:
a
dd
a
new test for git-merge-reso
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajn
a
make rem
o
v
e
-dashes: apply to scripts and programs a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bi
s
ect: use dash-less form on git
b
isect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
ik
l
os Va
j
n
a
t
1007-
h
ash-object
.
sh
:
use quotes for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajn
a
t0001-init
.
s
h
: change confusing dir
e
ctory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build
i
n merg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next