repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
2012-08-17
Miklos
V
ajna
m
a
n: git pul
l
-r
is
a
sho
r
t
for --rebase
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
M
i
klos
Vajna
Do
c
ume
n
tation:
s
pelling fixe
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Miklos
V
ajna
f
ormat-patch: do
c
ument the for
m
at
.
to co
n
figuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vaj
n
a
re
q
uest-
p
ul
l
:
avoid
mentioning that
the st
a
rt point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Mikl
o
s
Vajna
gi
t
k: Update Hungarian translati
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
Document dat
e
f
o
rmat
s
accep
t
ed by pars
e
_da
t
e()
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
b
u
ilti
n
-co
m
mit: add --date option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos V
a
jna
gi
t
-s
t
a
sh docu
m
entat
i
on:
m
ention def
a
ult
options for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Mikl
o
s
Vajna
g
it branch -D: give a be
t
te
r
e
rror message
w
hen lo
c
k
f
ile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklos Vaj
n
a
gi
t
-clone: add
missing comma
i
n --reference d
o
c
u
m
entation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
M
i
klo
s
V
a
j
na
hg-to-git: don
'
t import the unu
s
ed pop
e
n2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklo
s
Vajna
git
-
su
b
m
odule
doc
u
mentati
o
n
:
fix fo
r
each example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos V
a
jna
git-sv
n
doc
u
mentati
o
n: fix typo i
n
'r
e
ba
s
e
vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vajna
refs: use war
n
ing() inste
a
d
o
f fprintf(stde
r
r, "warn
i
ng:
"
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show
-
ref: use w
a
rning() instead
o
f fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s
Vajna
builtin-sh
o
w-branch:
use warning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bui
l
tin-rm: use warning() instead
o
f fprintf(std
e
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-init-db: use warning() instead of fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-fe
t
ch-pack:
u
se warning() in
s
tead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
i
kl
o
s
Vaj
n
a
b
uiltin-checkout: use warni
n
g() ins
t
e
ad of fprint
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-apply: use
warni
n
g() instead of
f
prin
t
f
(
s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vajna
ht
t
p-push: using error() and warni
n
g()
a
s app
r
opria
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
M
iklos Vajna
Tests: use
test_cmp
i
n
s
tead of diff w
h
ere possi
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklo
s
Vaj
n
a
pa
r
se-opt:
m
igrate builtin-ls-f
i
les
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklo
s
V
a
jna
g
ittutorial: r
e
move misleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
M
a
ke t3411 e
x
ecutab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Va
j
na
f
ast
-
expor
t
: print usage when no options specifie
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Mi
k
los Vaj
n
a
parse-
o
pt: migrate b
u
ilt
i
n-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajn
a
t
9129: skip the last three t
e
sts if U
T
F-8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPatc
h
e
s
:
ment
i
on the usage of real na
m
e in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
l
o
s Vaj
n
a
githooks documentat
i
on: add a note about the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-
d
aemon do
c
ument
a
tion: use {tild
e
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos
Va
j
na
Add s
u
pport for a pdf version of
t
he user
m
an
u
al
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vaj
n
a
git-
g
ui: Update Hungarian
trans
l
ation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
i
klos Vajna
h
ttp
.
c: use 'gi
t
_
c
onfig_string
'
t
o
g
et 'cur
l
_htt
p
_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule: use git re
v
-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
re
b
a
s
e: use git re
v
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
p
u
ll: u
s
e gi
t
rev-p
a
rs
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
lost
-
found:
use git rev-parse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-branc
h
: use
g
it
r
ev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Va
j
n
a
git-stash:
u
s
e git r
e
v-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mi
k
l
os V
a
jn
a
User's Manual:
remov
e
dupli
c
ated
url at the e
n
d o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
ik
l
os
Vajna
builti
n
_clone: use strbuf in c
m
d_
c
lone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builti
n
-
clone:
u
se strbuf
in clone
_
local() and copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
l
os Vajna
builtin-c
l
one:
use
strbuf in guess
_
dir_name
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mikl
o
s Vajna
Add
n
ew
t
estcase to s
h
o
w
fast-
e
xport do
e
s not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os V
a
jna
builtin-branch
:
use strbuf in rename_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
bu
i
ltin-branch: use strbuf in
f
ill_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s V
a
j
na
b
uiltin
-
b
r
anch: use strbuf in delet
e
_branc
h
e
s()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Update Hun
g
a
rian translation
.
100%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos
V
ajna
g
i
t-remote: d
o
cument the
migrat
i
on feature of
t
he ren
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos
V
ajn
a
git-remote
r
ename: migr
a
te fro
m
rem
o
tes/ and
b
ranch
e
s/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
rem
o
t
e: add a new 'origin' v
a
r
i
able t
o
the str
u
ct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
iklos Vajna
Implement git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
iklos Vajna
update-ref
-
-n
o
-
dere
f
-d:
h
andle the ca
s
e when
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
iklos
V
ajna
git branch -m: forbid ren
a
m
i
n
g
o
f
a symr
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix
git u
p
date-ref
--no-deref
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vajna
rename_re
f
()
:
handle the case when the refl
o
g of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Vajna
Fix g
i
t b
r
a
n
ch -
m
fo
r
symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-opt: migrate builti
n
-
c
h
eckout-i
n
dex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
ik
l
os Vaj
n
a
Add testcase
to ensure mergin
g
an earl
y
part of a b
r
anch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
d
d Lin
u
x PP
C
s
upport to the pre-
a
uto-gc e
x
a
m
p
l
e
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
t
e
st-lib: fix color reset in say_colo
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklo
s
Vajn
a
Imp
l
ement git clo
n
e
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Va
j
na
Cleanup in
s
ha1
_
f
i
l
e
.
c::cac
h
e_
o
r_un
p
ack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vaj
n
a
bu
i
ltin-commi
t
: use reduce_heads()
o
nl
y
w
h
en a
p
pr
o
priate
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
fore calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add n
e
w testcases
t
o ensure bu
i
ltin-comm
i
t uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: us
e
commi
t
_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
los Vajna
commit_t
r
e
e(): add a new author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501:
a
l
ways use t
e
st_cmp
instead of dif
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
bui
l
t
in
-
merge: release the l
o
c
kfile in try_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajn
a
merge-
r
ecursive: g
e
t rid of
v
irtu
a
l_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
mer
g
e-
r
ecur
s
ive: move current_{file,dire
c
tor
y
}
_s
e
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-re
c
ursive: move the global obuf
to
struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
l
o
s
V
a
j
n
a
merge-recursi
v
e: get rid of the index_onl
y
global
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
iklos Vajna
merge-recu
r
si
v
e
:
m
ove cal
l
_depth to struct mer
g
e_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makef
i
le:
a
dd m
e
rge_re
c
ursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
c
herry-pick/
r
eve
r
t: make dire
c
t in
t
ernal call to m
e
r
g
e_t
r
ee()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: avoid run_command_v_o
p
t() for re
c
ursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
a
j
na
merge-r
e
cursive: int
r
od
u
c
e
merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os
Va
j
n
a
Sp
l
it out merge_recursive() to merge-r
e
cursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s Vajna
M
a
kefile: enabl
e
S
N
P
R
I
NTF_RE
T
URN
S
_BOGUS for H
P
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklo
s
Vajna
Fix 'gi
t
help h
e
lp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: replace '
!
' with te
s
t
_
must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentation: document the pager
.
* config
u
ration s
e
tting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
ikl
o
s Vajna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
bu
i
ltin-help: always load
_
command_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
Ad
d
a second testc
a
se for handling
invalid strat
e
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vaj
n
a
Add a new test
f
or us
i
ng
a custom
m
erge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
l
o
s Vajna
builtin-merge: a
l
low using a
cus
t
om strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
b
ui
l
tin-hel
p
: make some i
n
ternal fu
n
ctions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t76
0
1: exten
d
the 'merge picks up the be
s
t
re
s
ult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
k
l
o
s Vajna
builtin-merge: give a pr
o
per
e
r
ror message fo
r
inva
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vajna
Teach
'
git merge' that some merge
s
t
r
ategies no
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
Add a new test for git-merge-r
e
sol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
l
o
s V
a
jn
a
t602
1
: add a new te
s
t f
o
r
git-merge-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
make remove-das
h
es:
apply to scrip
t
s and
p
rogra
m
s as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
V
a
jna
gi
t
-bisect: use d
a
sh-
l
ess
fo
r
m on git
b
isect
l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1
0
07-hash-obje
c
t
.
sh
:
use quo
t
es for th
e
t
est des
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next