repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Further merging in preparation for 1.7.12.1
2012-08-17
Miklos V
a
j
n
a
man: git pull
-r
i
s a sho
r
t fo
r
--r
e
base
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
Miklos Va
j
na
Documentation: spelling fixes
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vaj
n
a
f
o
rmat-patch: docum
e
nt
t
he
format
.
to con
f
iguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
M
iklos
V
ajna
r
equest-pu
l
l: avoid mentioning
t
h
a
t
the start
p
oint
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Mi
k
lo
s
Vaj
n
a
gitk
:
Upd
a
te Hungarian tran
s
lation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
D
ocument da
t
e
for
m
ats
accepted by parse
_
date()
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
builtin
-
commit
:
a
d
d --dat
e
optio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos Vajna
git-stash doc
u
mentati
o
n:
mention
default options f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Mikl
o
s
Vajna
git branch -D: give a bett
e
r
error
message when lockf
i
le
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
M
i
klos Vajna
git
-
clo
n
e:
a
dd mis
s
in
g
comma in --
r
eferenc
e
documen
t
atio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Va
j
na
hg-to-git: don't import the unused popen2 modul
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Mi
k
los V
a
jna
git-
s
u
bmo
d
ule doc
u
m
entatio
n
: f
i
x fore
a
ch ex
a
mple
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
git-svn documentation:
f
i
x typo
in 'rebase v
s
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs:
use warning()
i
n
s
t
e
ad of fpri
n
tf(stderr, "warning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
l
o
s Vajna
built
i
n
-
s
h
ow-ref:
use warni
n
g() instea
d
of fpri
n
tf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
los Vajna
bui
l
t
i
n-show-bra
n
ch: use warning(
)
inst
e
ad of fprin
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
bui
l
t
i
n-rm: use w
a
r
ni
n
g() instead
o
f fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
l
o
s Vajna
buil
t
in-init-db: use warning(
)
inste
a
d o
f
fprintf(s
t
d
e
rr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bui
l
t
i
n-fetch
-
pack: use warning
(
) instead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vajna
builtin-checkout: use
w
arning()
in
s
tead of f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
b
uiltin-apply: use warni
n
g() ins
t
ead of
fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
a
j
na
http-pus
h
: using error() and warn
i
ng(
)
as
a
ppropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos
V
ajna
Tes
t
s: us
e
test_cm
p
instead of d
i
ff wher
e
possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
M
iklos
Vajna
parse-opt: migrat
e
bu
i
ltin-ls-fil
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mi
k
los
Vajna
gitt
u
to
r
ia
l
: remov
e
misleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vaj
n
a
Make t3411 executa
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Va
j
na
fast-export:
p
r
i
n
t
u
sag
e
w
h
e
n no opt
i
o
n
s s
p
ecifi
e
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
M
i
klos Va
j
na
parse-opt: migr
a
te bu
i
ltin-a
p
ply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Va
j
na
t9129:
skip t
h
e last
t
h
r
e
e t
e
sts if UT
F
-8 l
o
cale i
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPatch
e
s: mentio
n
the usa
g
e of
real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
gi
t
hooks docum
e
ntation:
add a note
a
bo
u
t the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon documentation: use
{
tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Mi
k
los Vajna
Add suppo
r
t fo
r
a pdf version of the user m
a
nua
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos
Vajna
git-g
u
i
:
Update Hu
n
garian translation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos
V
ajna
h
t
tp
.
c: use 'git_config_string' to get
'cur
l
_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
submo
d
ule: use
git re
v
-
p
ars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos V
a
jn
a
rebase:
use
g
it rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
pull: use gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
l
o
st-found: use
git r
e
v-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
l
os
V
a
jna
fi
l
te
r
-
branch: use git rev-p
a
rs
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
gi
t
-sta
s
h: use
g
i
t
rev-p
a
r
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
Vajna
Use
r
'
s
Manual:
r
emove duplicated
url a
t
the end o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klos Vajna
builtin_
c
lone: use strbuf in
c
md_cl
o
ne()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin-clone
:
use
strbu
f
in c
l
one_local() an
d
copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
ajna
built
i
n-c
l
one: use strbuf in guess_dir_n
a
me()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mikl
o
s
V
a
j
n
a
Add new
t
estca
s
e
t
o show fast-export does
n
o
t always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
u
i
l
tin-branch: use s
t
rbuf in rename_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vaj
n
a
builtin-branch: use strbuf i
n
fill_tracking_
i
nfo()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os
V
ajna
bu
i
ltin-
b
ra
n
ch: use strbuf in
d
elete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
Update Hu
n
garian
t
ranslation
.
100
%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajn
a
git-
r
emote: do
c
ument th
e
migration feature
o
f the
r
ename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
iklos Vajna
git-remote
r
ename: migrate from remotes/ an
d
branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
M
i
kl
o
s Vajna
re
m
ote
:
a
d
d a new
'
origin' variabl
e
to the str
u
ct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mik
l
os V
a
j
n
a
I
m
plement
git remote ren
a
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Mi
k
los Vajna
u
pdate-ref -
-
no-deref -d:
handle the ca
s
e when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
i
k
los Vajn
a
g
it branch
-
m: forbid renaming o
f
a symr
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
Fi
x
git update-re
f
--no-deref
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos
V
ajna
rename_ref():
h
andle the
case when the re
f
log of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix g
i
t branch -
m
for symref
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos V
a
jna
parse-opt: migrate builtin-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los
V
a
j
na
Add testcase to ens
u
re me
r
ging an ea
r
ly part o
f
a
b
ranch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
lo
s
Vajna
Add Lin
u
x PPC su
p
port to the p
r
e-
a
uto-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
V
ajna
test-lib: fix colo
r
reset in say_colo
r
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos V
a
jna
Impleme
n
t git clone -
v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mi
k
los Va
j
na
C
l
eanup in
s
ha1_fil
e
.
c
::
c
ache_or_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-commit: us
e
reduce_heads()
only when appro
p
riate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-m
e
rge: re
f
resh
t
h
e index
b
efore calling a s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
t7603: a
d
d new testcase
s
to ensure
b
u
i
l
tin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
builtin-co
m
mit: use
c
ommit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
co
m
m
it_tree():
add a new autho
r
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
na
t7
5
01: always us
e
tes
t
_
c
mp
instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
b
ui
l
tin-m
e
rg
e
: release
the lockfile in try_merge_strate
g
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: get rid of
virtual_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recur
s
ive: move current_{f
i
le
,
d
i
recto
r
y}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
m
e
rge-recur
s
ive: m
o
ve the
global obuf to struct merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recursi
v
e
: g
e
t
rid of the
index_only glo
b
a
l v
a
riabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
iklos Vajna
merge-recursive:
move call_depth
t
o struct me
r
ge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mikl
o
s Vajna
M
akefile: ad
d
merge_re
c
ursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pick/rev
e
rt: m
a
ke direct internal call to
m
erge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-mer
g
e:
a
vo
i
d run_command_v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
me
r
ge-recursive: introduce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klo
s
Va
j
na
Split out
m
erge_rec
u
r
s
ive() to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
ajna
Makef
i
le: enable SNPRINTF_RETURNS_BOGUS
f
or HP-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos
Vajna
Fix 'gi
t
hel
p
help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
iklos V
a
jna
t930
0
: replace
'!' with test_must
_
fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklo
s
V
ajna
Do
c
umentation
:
docume
n
t the
p
ager
.
*
c
onfi
g
ura
t
ion se
t
ting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos V
a
jna
Builtin git-he
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mikl
o
s Vajna
builtin-
h
el
p
: always lo
a
d_co
m
mand_list() in
cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
ikl
o
s Vajna
Ad
d
a
s
e
cond testca
s
e for ha
n
d
ling
i
nvalid s
t
rate
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
Add a
n
ew te
s
t f
o
r
us
i
ng
a custom merge s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
l
os Vajna
builtin-merge:
allow
using a custom strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Va
j
na
builtin
-
help:
make s
o
me i
n
t
e
rnal
fu
n
ctions
available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklo
s
Vajna
t7601: ext
e
nd the
'
merge pi
c
k
s
up the bes
t
r
e
sult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klo
s
V
ajna
b
ui
l
tin
-
merge: give a p
r
o
p
e
r
e
r
r
o
r
mes
s
age for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajn
a
Teach 'git merge' that some
m
erg
e
st
r
ategies
n
o longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
A
d
d a new test for
git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
k
lo
s
Vajn
a
t6021: a
d
d
a
new test fo
r
g
i
t-me
r
ge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
mak
e
re
m
o
ve-da
s
hes: apply t
o
scrip
t
s and p
r
ogram
s
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-b
i
sect
:
use dash-less form on git b
i
s
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
t1007-hash-
o
bject
.
sh:
u
s
e
quotes for the test descrip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next