repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'hv/config-from-blob'
2013-07-02
Miklos
V
ajna
merge: handle --ff/--no-ff/--ff-only as a tri-state
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2013-04-11
Miklos Vajn
a
ch
e
rry-pick
:
make su
r
e
a
l
l input
o
bjects are co
m
mits
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-09-14
Miklos Va
j
n
a
cherry-pick: don't forg
e
t -s on failure
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-08-17
Mik
l
os V
a
jna
m
a
n: git pull -r
i
s a short for --r
e
base
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
Miklos Vajn
a
Do
c
umentat
i
on: spelling fix
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Miklos V
a
jn
a
forma
t
-pat
c
h: doc
u
ment the
f
orma
t
.
to
configura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vajna
request-pull: avoid men
t
i
oning
t
hat t
h
e sta
r
t
point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Mik
l
os Vajna
gitk:
U
pd
a
t
e
Hung
a
ria
n
t
r
ans
l
ation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
Do
c
ument date f
o
rmats accepted by parse_date()
commit
|
commitdiff
|
tree
2009-12-03
Miklos V
a
jna
b
uiltin-commit: add
--dat
e
o
p
t
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos Vajna
git-st
a
sh documentation:
m
ention default opt
i
o
ns fo
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Mik
l
os Vajna
g
i
t branch -D: give a
b
etter error m
e
s
s
age wh
e
n loc
k
file
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklos Vajna
git-clone:
add mi
s
sin
g
c
o
mma in -
-
r
e
fere
n
ce document
a
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vajn
a
hg-to-git
:
don't im
p
ort t
h
e unused popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajn
a
git-s
u
bmo
d
ule d
o
cumentation: fi
x
fo
r
each ex
a
mpl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
git-svn
d
ocumentation:
f
ix typo
i
n
'
r
e
base vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs: use
w
arning() inst
e
a
d
of fpr
i
ntf
(
stderr, "warning: "
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-ref: use wa
r
ning()
inst
e
ad
o
f fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
u
iltin-s
h
o
w
-
br
a
nch: use warning() i
n
stead of fpri
n
tf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
builtin-rm: use warni
n
g
() instead o
f
fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
builtin-i
n
it-d
b
: use warni
n
g() instead of fprintf(
s
tderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
u
i
l
ti
n
-
f
e
tch-pack: use
warning() inste
a
d
of fprint
f
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Va
j
na
builtin-checko
u
t: use warning()
i
nstead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vaj
n
a
builtin-apply: use warni
n
g(
)
instead o
f
fpri
n
tf(std
e
rr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
ht
t
p-
p
ush: using er
r
or(
)
and warni
n
g()
a
s appropria
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos V
a
jna
Tests:
u
se t
e
st_cmp instea
d
of diff where
possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mik
l
os Vajna
pars
e
-opt: migrate built
i
n
-ls-fi
l
es
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gittutorial: remove misleading no
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Mik
l
os Vajn
a
Make
t
34
1
1 e
x
ecutable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajn
a
fast-
e
xp
o
rt: pr
i
nt usage when no option
s
specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
M
i
klo
s
Vajna
pars
e
-op
t
: migrat
e
b
u
i
l
tin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t912
9
: skip t
h
e l
a
s
t t
h
re
e
t
e
s
ts if UTF-8 locale
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
M
i
klos Vajna
SubmittingPatches: menti
o
n the usage o
f
real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks documentation
:
add a n
o
t
e
a
bout 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
Miklo
s
Vajna
Add
s
upport for a pdf version
o
f
the user m
a
nual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-gui: U
p
date Hungarian trans
l
ation for 0
.
1
2
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
i
klos Vaj
n
a
h
ttp
.
c: use
'gi
t
_
c
onfig_string' to
g
et 'curl_http_prox
y
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
sub
m
od
u
le: u
s
e git rev
-
p
a
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s V
a
jna
reb
a
s
e: use gi
t
rev-p
a
r
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
ik
l
o
s
Vajna
pull: use git rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
lost
-
f
o
u
nd: us
e
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los
Vaj
n
a
filt
e
r-branch: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
git-stash: use git
rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos
V
ajna
User's Manua
l
: re
m
ov
e
du
p
licated url at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
iklo
s
Vajna
builtin_clone: use strbuf
i
n
c
md_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
k
lo
s
Vajn
a
buil
t
in-clone
:
u
se strbuf in
c
l
one_local()
and copy_
o
r_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bu
i
ltin-clo
n
e: use str
b
uf in guess_d
i
r_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mi
k
l
os Vajna
A
d
d new testcas
e
to show
f
ast-export does not a
l
way
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
built
i
n
-bran
c
h:
u
se strb
u
f in rename_br
a
nch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch
:
use st
r
bu
f
in fill_tracking
_
info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vaj
n
a
b
u
i
l
ti
n
-branch: use st
r
buf in
delete_branches
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Update Hungar
i
an tr
a
nslation
.
10
0
%
c
omple
t
e
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-re
m
ote: document
the migration feature of the
rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
los Vaj
n
a
git-remote renam
e
:
migrate from remotes/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos V
a
jna
remo
t
e:
add a
new 'o
r
igi
n
' var
i
ab
l
e
t
o the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
i
klos
V
ajna
Implem
e
nt git remote rena
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
update-
r
ef
-
-no-d
e
ref
-
d: h
a
n
dle the cas
e
when th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mi
k
los Vajna
gi
t
branch -m: forbid ren
a
ming of a s
y
mref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajna
Fix git update-ref --no
-
deref
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Va
j
n
a
re
n
ame_ref():
handle the c
a
s
e
when
the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
k
lo
s
Va
j
na
F
i
x git branch -m for symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-opt: migrate bu
i
ltin-check
o
ut-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajn
a
Add testc
a
se t
o
ensure merging an
e
arly part of
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux PPC su
p
port to
the pre-a
u
to
-
g
c
examp
l
e
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Mi
k
los Vajn
a
tes
t
-
lib: fix color reset in say_colo
r
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Va
j
n
a
Im
p
lement git c
l
one -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s Vajna
Cleanup
i
n sha1_file
.
c::cache
_
or_unpack
_
entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklo
s
Vajna
bu
i
ltin-commit: u
s
e
red
u
ce_
h
eads() o
n
l
y when
a
ppro
p
riate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
i
klos Vajna
b
uiltin-merge: refresh the index bef
o
re c
a
lling a str
a
teg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
t
76
0
3: add new test
c
ases to en
s
ure
b
u
i
ltin
-
c
o
m
mit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
buil
t
in-c
o
m
m
it: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
commit_tree(): add
a new
a
uthor pa
r
ameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: always use t
e
st_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
iklos V
a
j
na
builtin-
m
erge:
r
e
lease the lock
f
ile in try_merge_strat
e
gy
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos
Vajna
merge-recur
s
ive: get rid of
v
i
r
tual_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erge-recursive: move
curr
e
nt_{file,
d
irectory}
_
set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
m
erge-r
e
curs
i
v
e: move the g
l
o
bal obuf to
s
t
r
uct
m
erge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merg
e
-r
e
cursi
v
e: get r
i
d
o
f the index_only global
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recurs
i
ve: move
c
all_dept
h
to
s
t
ruct merge_op
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Make
f
i
le
:
a
dd m
e
rge_recursi
v
e
.
h
t
o
LI
B
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
k
los V
a
jna
c
herry-pick/rev
e
rt:
m
ake direc
t
inter
n
al call to m
e
r
ge_
t
ree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
b
u
i
l
tin-merge:
a
vo
i
d run_comman
d
_v
_
opt
(
)
for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
l
o
s V
a
jna
merg
e
-recursive:
i
ntroduce merge_o
p
tion
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajn
a
Split
o
ut merge_recur
s
ive()
to mer
g
e-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
ik
l
os Vajna
Makefile: enable S
N
P
RINTF_RET
U
RNS_B
O
G
U
S f
o
r HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Va
j
na
Fix '
g
it help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t93
0
0: replace '!'
wi
t
h test
_
mu
s
t
_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
iklo
s
V
a
j
na
Documentatio
n
: document the pager
.
* con
f
i
g
uration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
ik
l
os Vaj
n
a
Builtin
git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
Vajn
a
built
i
n-help:
always load_co
m
mand
_
lis
t
() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add a seco
n
d testcase for handling invalid s
t
ra
t
eg
i
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
n
a
A
d
d a new
test for u
s
i
ng a custom merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s Vajna
b
u
iltin
-
merge: allow usin
g
a cu
s
tom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vaj
n
a
b
uiltin-help: make so
m
e int
e
rnal
functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend
the 'm
e
r
g
e picks up the best res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin
-
merge:
g
ive a proper error message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Te
a
ch 'git merge
'
t
h
a
t
some merg
e
strateg
i
es no lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Vajn
a
Add a new tes
t
f
or git-
m
er
g
e
-reso
l
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos Vajna
t6021: add a new
te
s
t for git-merge
-
resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next