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 'mv/merge-ff-tristate'
2013-07-02
M
i
klos Vajna
merge: ha
n
dle --ff/-
-
no-ff/--ff-
o
n
l
y a
s
a tri-
s
tate
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2013-04-11
M
iklos Vajna
che
r
ry
-
p
i
c
k: make s
u
re
a
ll
i
nput
objects are commits
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-09-14
M
i
klos Vajna
cherry-pick: don't
forget -s o
n
fa
i
lure
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-08-17
M
i
kl
o
s Vaj
n
a
man:
g
i
t pull -r
i
s a short for --rebase
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
Miklos V
a
j
n
a
Documentation: spelling fixes
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Mik
l
os Vajn
a
f
ormat-pa
t
ch: docume
n
t the
forma
t
.
t
o
configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklo
s
Vajna
re
q
uest
-
pu
l
l: avoid mentioning that the start poi
n
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Miklos Vajna
git
k
: Update Hungarian
translation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
Document date
formats acce
p
ted
b
y parse
_
date()
commit
|
commitdiff
|
tree
2009-12-03
Miklos
Vajna
b
u
i
ltin-
c
ommit:
a
dd --
d
ate
o
p
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Mik
l
os Vajna
git-
s
tash documentation:
m
ention default options for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos
V
a
jna
git branch
-
D: give a bett
e
r error mess
a
ge when lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklos Vajna
git-clone
:
add m
i
ss
i
ng com
m
a
in
-
-
refe
r
en
c
e do
c
umentation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vajna
hg-t
o
-git: don
'
t
i
mport the unused popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
M
i
klos Vajna
git-sub
m
o
dule
documentation: fix fore
a
ch
exam
p
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklo
s
V
a
j
n
a
git-
s
vn d
o
cumentation: fix typo in 'rebase v
s
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vaj
n
a
refs: use warning() instead of fprin
t
f(stderr, "warning:
")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-
s
how-ref: use warning() instea
d
of fpri
n
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s
V
ajn
a
bu
i
lti
n
-sh
o
w-b
r
anch
:
use war
n
i
n
g()
i
nst
e
ad of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vaj
n
a
bui
l
t
i
n-rm: use warning(
)
in
s
tead of
fprintf(s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
buil
t
in-init
-
db:
u
se w
a
rni
n
g()
i
ns
t
ead of
f
print
f
(st
d
err
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vaj
n
a
builtin
-
fetch-pack
:
use warning() instead
of fpr
i
ntf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builtin-ch
e
ckout
:
us
e
warning
(
) instead of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vajna
bui
l
t
in-ap
p
ly:
u
s
e
warning() instead of
fp
r
int
f
(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
ht
t
p-pus
h
: using
e
r
ror() and
w
arning() as
app
r
o
p
riate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos
V
ajna
Tests: use test_cmp inste
a
d of diff where p
o
ssible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajna
parse-op
t
: migrate bui
l
t
i
n
-ls
-
f
i
les
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mikl
o
s Vajna
gittutor
i
a
l
:
remove misl
e
ading no
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
i
klos Vajna
Make t3
4
1
1 e
x
ecu
t
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Mikl
o
s V
a
jna
fast-export: print usage w
h
en no op
t
ions specifi
e
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Mikl
o
s Va
j
na
parse-
o
p
t: migrate built
i
n-a
p
ply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mik
l
os Vajna
t9129: 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
M
i
klos
V
ajna
Submitting
P
a
t
c
hes: mention the usage of real
n
a
me in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
iklos
V
ajn
a
g
i
thooks docum
e
nta
t
ion: add a
note ab
o
ut
the
+
x mod
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
V
ajna
git-daemon documen
t
atio
n
: use
{
tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
i
k
los Va
j
n
a
Add
s
u
pport
for a pdf version of the use
r
manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos
V
ajna
git
-
gui: Update
Hungarian tra
n
slati
o
n
f
or
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
Vajna
http
.
c: use
'git_c
o
nfig
_
strin
g
' to
g
e
t
'
c
url_http_
p
roxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
sub
m
od
u
l
e
:
u
se git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
r
e
base:
use git
r
e
v-
p
arse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull:
use git rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
l
o
st
-
found: us
e
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
filt
e
r-branch: use gi
t
rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
gi
t
-st
a
sh: use git rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's Manua
l
: remove duplicated url at the
e
nd of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s V
a
jna
builtin_c
l
one: use st
r
buf in
c
md_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jn
a
b
u
iltin-clo
n
e: use strbuf in
c
l
one
_
l
o
c
al() and
c
opy
_
or
_
link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s
Vajna
b
uiltin-clone: use s
t
rbuf in guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
iklos
Vajna
Add new testca
s
e
to
s
how fast-export does n
o
t al
w
ay
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch: use strbu
f
i
n rename_bra
n
ch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
u
iltin-branc
h
: use strbuf in f
i
ll_
t
racking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builti
n
-branch: use
s
trbuf in delete
_
b
ranches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajn
a
Update Hungaria
n
transla
t
ion
.
1
0
0% c
o
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Va
j
na
git-remo
t
e: document th
e
mi
g
ratio
n
fe
a
tur
e
of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklo
s
Va
j
n
a
git-remote rename: migrate from remotes/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mikl
o
s Vajna
remot
e
: add a new 'origin' variable
to the s
t
r
uct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklo
s
Vajna
Imple
m
ent git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
u
p
date-ref --no-dere
f
-d: handl
e
the case whe
n
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mikl
o
s
V
a
j
na
git branch -m:
f
orbid renami
n
g of a symr
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos V
a
j
n
a
Fix git update-ref
--no-dere
f
-d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
ajna
rename_ref(
)
: handle the case w
h
en t
h
e reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s
V
aj
n
a
Fix git bran
c
h -m
f
or sy
m
refs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
M
i
klos Vajna
pars
e
-o
p
t: migrate builtin-checkout-
i
ndex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klos Vajna
A
dd
t
est
c
ase to ensure m
e
rgin
g
an
earl
y
pa
r
t of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los Vajna
A
d
d Linux
PPC
s
up
p
ort to the pre-auto
-
gc example
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib: fix color rese
t
in say_color
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Imp
l
ement
g
it clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
ik
l
os Vajna
C
l
eanup in
sha1_f
i
le
.
c::cache_or_unpac
k
_
entr
y
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
bui
l
t
i
n-commit: use reduce_heads() on
l
y when approp
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
V
ajna
bui
l
ti
n
-merge: refresh
t
he index b
e
fore calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add new testcases to ens
u
r
e
builtin-c
o
m
mit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vaj
n
a
builtin-
c
o
m
mit: use com
m
it_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Vaj
n
a
commit_tree(): add
a
n
ew
author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t75
0
1
:
a
l
ways use
test_cmp ins
t
e
a
d of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
i
klos Vajna
builtin-merge: r
e
l
ease
t
he lock
f
ile
in t
r
y_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-rec
u
rsive: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recurs
i
ve: move current_{file,dire
c
t
o
ry}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recursive
:
move th
e
global obuf to struct
m
erge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
kl
o
s Vajna
m
e
r
g
e-recursiv
e
: get rid of
the index_only glo
b
al variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mik
l
os Vaj
n
a
m
erge-r
e
cursive: move call_depth to struct merg
e
_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
ikl
o
s Vajna
M
akefile: ad
d
m
e
r
ge_recursive
.
h to
L
I
B
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
Vajna
cherry-pick/r
e
vert: ma
k
e dire
c
t interna
l
call to merge_tree
(
)
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vajna
builtin-merge: avoid run_command_v_opt() for
r
ecursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Vaj
n
a
m
e
r
ge-recursive: i
n
troduce merge
_
option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out
merge_re
c
ur
s
ive() to merg
e
-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
M
akef
i
le: enable SNPRINTF_RETURNS_
B
OGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
i
klos V
a
jna
F
i
x 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
V
ajna
t9300: repl
a
ce '!' with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los
V
ajna
Document
a
tion: document the pager
.
* confi
g
u
r
ation setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos
V
aj
n
a
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-he
l
p
:
a
lways lo
a
d_c
o
mmand_list() in c
m
d_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
A
d
d a second test
c
ase for handlin
g
in
v
a
lid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
dd a new test for using a
c
ustom
m
e
r
ge str
a
t
eg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
builtin-merge: allow
u
sing a cus
t
om strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s V
a
j
n
a
built
i
n-help: make so
m
e inte
r
na
l
funct
i
ons available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos V
a
jna
t76
0
1: extend the
'me
r
ge picks up th
e
best
re
s
u
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge
:
give a proper err
o
r message
for i
n
v
a
lid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Va
j
na
Teach 'git merge' that some merge str
a
tegies no longe
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vaj
n
a
Add a new test
f
o
r
g
i
t-merge-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new tes
t
for git-merg
e
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next