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 branch 'jk/format-patch-from'
2013-07-02
M
i
klos
V
ajna
merg
e
: handle --ff/-
-
no-ff/--ff-
o
nly as a tri
-
state
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2013-04-11
Miklo
s
Vajna
c
h
err
y
-p
i
c
k
:
m
ake sur
e
all input obje
c
ts
are commi
t
s
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-09-14
Miklos Vajn
a
c
h
e
r
ry-p
i
ck: d
o
n't forget -s on
f
ailure
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-08-17
Miklos Vajna
man:
g
it p
u
ll -r
is
a short for --rebase
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
M
i
k
los
Vajna
Documentati
o
n: spelling fixes
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Miklos
Vajna
format
-
pat
c
h: document th
e
f
ormat
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vajna
request-pull: avoid mentioning that the st
a
r
t
point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Miklo
s
Vajna
gitk: Update Hungaria
n
translation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Mikl
o
s
V
a
j
na
Document date forma
t
s acc
e
pted by pars
e
_
d
ate()
commit
|
commitdiff
|
tree
2009-12-03
Mi
k
los Va
j
n
a
builtin-c
o
m
mi
t
:
add --date option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
M
i
k
los Vajna
git-stash documentation: mentio
n
default op
t
ions for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos Vaj
n
a
g
i
t
b
r
anch -D: give a be
t
ter
error
message
w
hen lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklo
s
Vajna
git-clone: add m
i
s
s
ing comm
a
in --
r
efer
e
nce document
a
tion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos V
a
jna
hg-to-git: don't
import the unused
p
open2
modul
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajn
a
git-submodule
documen
t
a
t
i
o
n: fix fo
r
e
ach
e
xample
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
git-
s
vn
d
ocumentation: f
i
x ty
p
o in 'rebase
v
s
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs: use warn
i
ng
(
)
i
ns
t
ead of fpri
n
tf(s
t
derr,
"
warn
i
ng: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
u
iltin-s
h
ow-ref:
u
se war
n
ing() i
n
stead
o
f fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show
-
bran
c
h: use
warning()
i
nstead of
f
p
r
in
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-rm: use warning()
i
n
stead of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vajna
builtin-init-db: use warning() instead of fprintf(stder
r
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
bu
i
ltin-fet
c
h-pack: use warning
(
) instead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-
c
heckout
:
use wa
r
ning
(
) inst
e
ad of fp
r
i
ntf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
uiltin-apply: use warnin
g
()
instead of fp
r
intf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
http-push: using error
(
) and warn
i
n
g
() as appropr
i
a
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Mik
l
os
Vaj
n
a
T
e
s
t
s: use test_cmp instead
of dif
f
where possibl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklo
s
V
a
jna
parse-o
p
t: migrate
builti
n
-
ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
g
ittu
t
orial: remo
v
e mislea
d
ing no
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklo
s
Va
j
n
a
Make t3411
e
x
ecutable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-
e
x
port: pri
n
t usag
e
when no
o
p
t
ions s
p
ecified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
p
arse-opt: m
i
g
ra
t
e builtin-appl
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklo
s
Vajna
t
9129: skip
t
he last th
r
ee test
s
if UTF
-
8 local
e
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajn
a
S
ub
m
itt
i
ngPat
c
hes: mention the usag
e
of
r
eal na
m
e in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
Va
j
na
gi
t
hoo
k
s
d
o
cumentation: add a note about the
+x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os
V
a
j
na
git-daemon do
c
um
e
ntation:
u
se {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos
V
ajna
Add
support for a pdf version of t
h
e u
s
er manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos
Vajna
git-gu
i
:
U
pdate Hungarian translation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c: use 'g
i
t_config_string' to get 'curl_http
_
p
roxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajn
a
submo
d
ule: u
s
e git re
v
-par
s
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebas
e
:
use git
rev-p
a
r
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
pull: us
e
git rev
-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajn
a
lost
-
f
o
und: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jn
a
filter-bra
n
ch
:
use
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
g
i
t-sta
s
h: use
g
i
t rev-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos V
a
jna
User's Manual: r
e
move duplica
t
ed url at
t
he end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
los Vajn
a
builtin
_
c
lon
e
: use s
t
rb
u
f in
cmd_cl
o
ne()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
builtin-c
l
one
:
use strbuf
i
n cl
o
n
e
_
l
o
ca
l
() and cop
y
_
o
r_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vaj
n
a
bu
i
lt
i
n-clone: u
s
e strbuf
i
n guess_dir_nam
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajn
a
Ad
d
n
ew te
s
tcase to show
fast-export
do
e
s not alway
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
builtin-br
a
n
c
h
: use s
t
rbuf in rename_bran
c
h()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s
Vajna
buil
t
i
n
-branch: use
s
t
rbuf in fill_tracking_in
f
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
u
iltin-branch: use
s
trbuf in
d
elete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Va
j
na
Updat
e
H
u
ngarian translation
.
100%
co
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos
Vajna
git-remote: document the
m
igr
a
tion feature
of the ren
a
m
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos V
a
jna
git-r
e
m
o
te
r
en
a
me: migrate f
r
o
m
remotes/
and
br
a
nches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vaj
n
a
remote: add a new 'origin' variable to
th
e
struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Implement
g
it remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos
Vajna
update-ref --no
-
d
eref
-
d
: handle the case wh
e
n th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklo
s
Vajna
gi
t
branch -m: forbid renaming
o
f
a symre
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Vajna
Fix git u
p
date-ref --no-der
e
f
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
k
los
V
a
jna
renam
e
_
r
ef(): handle the
c
ase w
h
en the re
f
log of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
V
ajna
Fix git branch -m f
o
r symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos
Vajna
parse-opt: migrate builtin-
c
heckout
-
index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add
t
estcase t
o
ensure mer
g
ing an
ear
l
y part of a
b
r
a
nch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
Vajna
Add L
i
nux PPC sup
p
ort to
t
he p
r
e
-au
t
o
-gc example hoo
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
Va
j
na
tes
t
-lib: fix c
o
lor reset
in
s
ay_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mi
k
los Vajna
Implement git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup in sha1_file
.
c::cache
_
or_unpa
c
k_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
b
ui
l
tin-commit
:
use re
d
uce_heads
(
)
only when
a
pp
r
opriat
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
iklo
s
Vajna
builtin-merge: ref
r
e
sh the
i
ndex bef
o
re calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos
V
ajna
t7603: add new testca
s
e
s to ensure builtin-commi
t
uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use commit_tr
e
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
ajna
c
om
m
it_tree(): add a
n
ew a
u
th
o
r parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s
Vajna
t75
0
1: a
l
w
ays us
e
test_cm
p
instead o
f
dif
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vaj
n
a
builtin-
m
e
r
g
e
:
release the
l
o
ckfile in try_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursi
v
e
: get ri
d
of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: move cu
r
rent_{file,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive
:
m
ove
t
he gl
o
ba
l
o
buf to struct mer
g
e_op
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
me
r
ge-recursive: get rid
of
the index_only
global variab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mi
k
l
os Vajn
a
m
erge-recursive: move cal
l
_depth to struct merge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
ikl
o
s Vajna
Mak
e
file: add merge_recursive
.
h to LIB
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
cherry
-
p
i
ck/rever
t
: make direct interna
l
call
t
o
merge_tree
(
)
commit
|
commitdiff
|
tree
2008-08-31
M
i
klo
s
Vajna
builtin-merge: avoid run_com
m
and_v_
o
pt() f
o
r recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s
Vajna
merge
-
recursive: introduce m
e
rge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
S
p
lit out m
e
rge_re
c
ursive()
to me
r
ge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos V
a
j
na
Makefile:
enable SNPRIN
T
F_RETURNS_B
O
GU
S
for
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajn
a
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vajna
t9300:
r
epla
c
e
'!' with
t
e
st_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docum
e
ntatio
n
: document the pager
.
* con
f
i
g
uration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mik
l
os Vajna
Bui
l
tin
g
i
t
-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
iklo
s
Vajna
b
ui
l
tin-help: always load_c
o
m
m
and_lis
t
(
) in
cmd
_
help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os
V
ajna
A
dd a second t
e
stc
a
s
e
for hand
l
ing invalid strat
e
gi
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
Add
a new tes
t
for us
i
ng a custom merge stra
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos
V
ajn
a
builtin-merge: allow using a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
builti
n
-help: make some intern
a
l
fu
n
ctions avai
l
able
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: ext
e
n
d the
'merge p
i
ck
s
up t
h
e bes
t
r
esult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vajna
builtin-merge: give
a
proper
err
o
r message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
l
os
V
ajna
Teach 'gi
t
merge' that some
m
e
rge
strategies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajn
a
Add a new test for git-me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t60
2
1
: add a new test for gi
t
-
merge-res
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next