repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge: handle --ff/--no-ff/--ff-only as a tri-state option
2013-07-02
Miklos
V
ajna
merge: han
d
le -
-
ff/--no-ff/--ff-only as a t
r
i-state
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2013-04-11
Miklos
V
a
j
n
a
cherry-pick: make sure all input
object
s
ar
e
co
m
mi
t
s
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-09-14
M
i
klo
s
Vajna
cherry-pick: don't forget -s on failure
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-08-17
Miklos Va
j
na
man:
git pull -r
i
s a short for -
-
r
e
ba
s
e
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
Miklos Vajna
Documentation: spelling f
i
xes
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Mi
k
los Vajna
format-patc
h
: doc
u
m
e
nt
t
he format
.
t
o config
u
rati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vajna
r
e
qu
e
s
t-pull
:
avoid men
t
ioni
n
g that th
e
start point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Miklos Va
j
na
gitk: Update Hu
n
garian
transla
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos
V
a
j
na
Document date form
a
ts accepted
b
y pa
r
se_date()
commit
|
commitdiff
|
tree
2009-12-03
M
i
kl
o
s Vaj
n
a
builtin-commit: add
--date
o
p
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
M
iklos Vajna
git-stash do
c
umentation: mention
defau
l
t opti
o
ns for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
M
i
kl
o
s Vajna
g
i
t br
a
nch -D: g
i
v
e a bette
r
error mess
a
ge
w
h
en lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Mikl
o
s
Vajna
git-clone: add missing
c
o
mma in --r
e
ferenc
e
do
c
u
mentati
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Mik
l
os Vajna
hg-to-git: do
n
't im
p
o
r
t the unused po
p
en2 m
o
dule
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Mik
l
os V
a
jn
a
git-submo
d
u
le doc
u
mentation: fix foreach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
g
it-svn documentation: fix ty
p
o
in
'r
e
base vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
re
f
s: use warning() inst
e
a
d
o
f fprintf(stde
r
r, "warning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builtin-show-ref: use
w
arning() inst
e
ad of f
p
ri
n
tf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builti
n
-show-branch: use warning() i
n
s
tead of f
p
rintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-rm
:
use warning() instead of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
built
i
n-in
i
t
-
d
b: use warn
i
ng() inst
e
ad of f
p
rintf
(
s
tde
r
r
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
iklos Va
j
na
builti
n
-fet
c
h-pack: us
e
warn
i
ng() instead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
builtin-checkout
:
use warning() instea
d
of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os
Vajna
builtin-
a
ppl
y
: use warning() i
n
stead of fprintf(stde
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
h
t
tp-push: using err
o
r() and wa
r
ni
n
g() as
a
p
propriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Mik
l
o
s Vajna
Te
s
ts: use
t
est_cm
p
in
s
tea
d
of diff where possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
M
i
klos
V
ajna
par
s
e-opt: migrat
e
builtin-ls-fil
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos V
a
jna
gittuto
r
ial: remo
v
e
misleadin
g
note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos
Va
j
na
Ma
k
e
t3411 e
x
ecutable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
f
a
s
t-ex
p
or
t
: print us
a
ge when no opti
o
n
s
specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
parse-opt: m
i
gr
a
te builtin-ap
p
ly
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t9129:
skip
the
l
ast three tes
t
s
i
f UTF-8 loc
a
l
e
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos V
a
jna
Su
b
mittingPatche
s
:
mentio
n
t
he usage of real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Vajna
githooks documen
t
ation: add
a note ab
o
ut
the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajn
a
git-
d
aemon
d
ocu
m
en
t
at
i
on: use {tild
e
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
i
klo
s
Vajna
Add support for
a pdf
v
ersion of the user man
u
al
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Mik
l
os Vajna
git-gu
i
: Update Hungarian tr
a
n
s
lation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Mi
k
l
os Vajn
a
http
.
c: us
e
'git_config_stri
n
g' to
g
et
'
curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
reba
s
e: use
g
i
t rev-
p
arse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull:
u
se git rev-
p
ars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
l
ost-found: use git re
v
-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os
Vajn
a
filter-bra
n
ch:
use gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os
Vaj
n
a
g
it-stash: us
e
git rev-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
M
ik
l
os Vajna
U
ser's
Man
u
al:
r
emove
d
u
p
li
c
ated url at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos Va
j
na
builtin_clone
:
u
se strbuf
i
n cmd_c
l
one()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
b
u
iltin-clone: use strbuf in c
l
o
ne
_
l
oc
a
l() and copy_o
r
_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajna
b
u
iltin-clone: use strbuf
i
n
gue
s
s_d
i
r
_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
iklos Vajna
Add new
te
s
t
c
ase
to show
fast-export does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
lo
s
Vajn
a
builtin
-
branc
h
: use
s
t
rb
u
f in r
e
name_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos
Vajna
bui
l
tin-branch:
u
se strbuf in
fill_tr
a
cking_inf
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
u
il
t
i
n-branch
:
use st
r
b
u
f in delete_bran
c
h
e
s()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Up
d
a
t
e Hun
g
ar
i
a
n
tran
s
l
ation
.
10
0
% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
klos
V
ajna
git-remote: document the mi
g
ration featur
e
o
f the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-rem
o
te
r
ename: migrate from remotes/ and
b
ranches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mik
l
os
V
ajna
re
m
ote: add a new 'orig
i
n' variab
l
e to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mi
k
los Vajna
Implement git
r
e
mote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Mik
l
os V
a
jna
update-ref --no-deref
-
d: handle the cas
e
when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vaj
n
a
git
b
ranc
h
-m: forbid renaming of a
symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
ajna
Fix git
update-re
f
--no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajn
a
ren
a
me_ref(): handl
e
the
c
ase
when the refl
o
g of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git branch -m fo
r
s
y
mr
e
fs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-op
t
: migrate
b
uiltin-checkout-ind
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add
testcase to ens
u
re m
e
r
g
ing a
n
early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
Vajna
Add L
i
nux PPC
s
upport
to t
h
e
pre-auto-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
i
k
los Vajna
t
est-lib: fix color reset
i
n say_col
o
r()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Va
j
na
Impl
e
ment git clo
n
e
-
v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Vajna
C
l
eanup
in sha1_f
i
le
.
c
:
:cache
_
or_unp
a
ck_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-commit: use r
e
duce_heads() onl
y
when appropriat
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mikl
o
s
Vajna
buil
t
in-merge: re
f
resh
t
h
e index be
f
ore c
a
lling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add new testca
s
es to ensure builtin-
c
ommit us
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
builti
n
-commit
:
use c
o
mm
i
t_t
r
ee()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajn
a
commit_tr
e
e
(
): add a new author pa
r
ameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501:
a
lways u
s
e
t
est_cmp in
s
t
ead of
d
iff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Va
j
na
builtin-merge: release the lockfile in
t
r
y
_
m
erge_stra
t
egy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos
V
aj
n
a
merge-r
e
cursive: g
e
t rid of
v
irtual_i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-re
c
ursive: m
o
ve
c
urrent_
{
file,direc
t
ory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos V
a
jna
mer
g
e
-recursive: mo
v
e the glo
b
al obu
f
t
o struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajna
merge-recu
r
sive: g
e
t
r
i
d of
the inde
x
_
o
nly global
v
a
r
iable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recursive: m
o
v
e call_de
p
th to s
t
ruct
merge_opt
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
M
akefile: add merge_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
V
ajna
cherry-pi
c
k/revert
:
make direct inte
r
nal call
to
m
erge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin
-
me
r
g
e
: avoid run_command_v_
o
p
t() for
recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
merge-rec
u
rsive: introduce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
S
p
lit out merge_recursive() to m
e
rge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
ajna
Makefile: enabl
e
SN
P
RINTF_RE
T
URNS
_
BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vajna
Fi
x
'
g
i
t
h
elp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vaj
n
a
t9300:
replace '!' with test_
m
ust_fai
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mi
k
los V
a
j
na
Documen
t
ation: documen
t
the pager
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
i
klos Vajna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos Va
j
na
builti
n
-help: always load_command_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
Add a secon
d
tes
t
c
ase
f
or handling invalid strat
e
gie
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
los V
a
jna
Add
a
new t
e
st f
o
r
usin
g
a
c
u
s
tom merge st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os
Vajna
builtin-
m
e
r
ge: al
l
ow using a cus
t
om strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os V
a
jna
built
i
n-he
l
p
:
make so
m
e inte
r
nal functions ava
i
lable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klo
s
Vajna
t7601: extend the '
m
erge picks up
t
h
e
best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Vaj
n
a
builtin-merge: give a proper err
o
r message for i
n
v
a
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os V
a
jna
Teach 'git merge'
t
hat some mer
g
e strategies n
o
lon
g
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Ad
d
a new test
f
o
r git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
t6021: add a new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next