repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'dw/request-pull-diag'
2013-07-02
M
i
k
los Vaj
n
a
mer
g
e: handle --ff/-
-
no-ff/--ff-only as a tri-s
t
ate
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2013-04-11
Miklos Vajna
cherr
y
-pick: make sure all inp
u
t objec
t
s
a
re commits
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-09-14
Miklos Vajn
a
cherry-pick: do
n
't forget -s on
f
ailure
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-08-17
M
i
klos Vajna
man:
git pull
-
r is a
s
hor
t
for --rebase
Signed-off-by:
Miklos Vajna
<vmiklos@suse.cz>
commit
|
commitdiff
|
tree
2012-06-19
M
i
klos Vajna
Documentation
:
sp
e
lling fixes
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vajna
forma
t
-patch: d
o
cu
m
e
n
t t
h
e
format
.
to
configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Mik
l
o
s
Vajn
a
request-pull: avoid men
t
ion
i
ng
that the st
a
rt
p
o
i
nt
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
M
iklos Vajna
gitk: Update
H
ungaria
n
t
r
a
n
s
l
ation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
Document date f
o
rmat
s
acc
e
pted by parse_date()
commit
|
commitdiff
|
tree
2009-12-03
Miklo
s
V
a
j
na
b
u
iltin-commit:
a
d
d
--date
optio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos Va
j
na
g
it-stash docu
m
entation: men
t
ion default o
p
ti
o
ns for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos
V
ajna
g
i
t branch -
D
:
give a bett
e
r error mes
s
age when l
o
c
k
file
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
M
i
klos Vajn
a
git-clone: add missing comma
in --reference documentation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vajna
hg-to-git: don
'
t
i
mport the unu
s
ed popen
2
m
odul
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Mi
k
l
o
s
Vajna
g
it-s
u
bm
o
dule document
a
tion: fix foreach
exampl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
M
i
k
l
o
s Va
j
na
g
i
t-svn doc
u
men
t
at
i
on: fix typo in 'rebase
v
s
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
aj
n
a
r
efs:
use warning() instead of fpr
i
n
tf
(
s
tderr, "warning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builti
n
-show-
r
ef:
use wa
r
ning()
i
nstead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
builtin-show-bra
n
ch: use warning() instead of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
uiltin-rm:
u
se
w
arning() inst
e
ad of fpri
n
t
f(s
t
der
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
b
u
il
t
in-init-d
b
: use
w
arn
i
ng() instead of fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los
V
ajna
builtin-fetch-
p
ack: use warning() inst
e
ad
o
f
f
printf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os V
a
j
n
a
builti
n
-che
c
kout: use warni
n
g() in
s
tead
o
f fp
r
in
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
builtin
-
apply:
use warning() inste
a
d of fprintf(s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
http-push: using error() and wa
r
ning()
a
s approp
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklo
s
V
ajna
T
ests: use test_cmp inst
e
ad of diff where
poss
i
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos
V
ajna
parse-opt: migrate b
u
ilti
n
-ls-fi
l
es
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vaj
n
a
gittutori
a
l: remove misleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Mi
k
los Vajn
a
Mak
e
t3
4
11 executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos V
a
jna
fast-export: p
r
i
nt usage when no option
s
specifi
e
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
M
iklos V
a
j
n
a
pars
e
-opt: migrate bui
l
tin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
M
i
klos Vajn
a
t
9129: skip t
h
e last three t
e
sts if
U
TF-8
l
ocal
e
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos
V
ajna
SubmittingPa
t
ches: men
t
ion t
h
e
usa
g
e o
f
real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
iklos Vajna
g
it
h
ooks
d
o
c
u
mentation: a
d
d
a note about the +x
m
o
d
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon
documenta
t
ion: use {t
i
lde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklo
s
Vajna
Add support for a pd
f
versio
n
of
t
he user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos Vajna
git-gui:
Update H
u
ngarian tra
n
sla
t
i
o
n for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos
V
a
jna
http
.
c: use 'git_config_string
'
to
g
e
t
'
cu
r
l_http
_
p
roxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
submodule
:
use g
i
t rev-pars
e
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
reb
a
s
e
: use git
r
ev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
pull: use git rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost
-
fo
u
nd: 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 git rev-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
git-stash: use git re
v
-pars
e
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
M
i
klos Vajn
a
U
s
er
'
s Manual: remove duplic
a
ted url at the
e
nd of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajn
a
builtin_clone: use strbuf in
c
md_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vaj
n
a
builtin-cl
o
ne: use strbuf in clone_loc
a
l
(
)
and cop
y
_or_li
n
k_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
b
u
i
ltin-clone: use strbuf in guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Mikl
o
s Vaj
n
a
Add new
testcas
e
to show fast-expor
t
does not al
w
ays
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
lo
s
Vajna
builti
n
-branch: use
s
t
r
b
uf in rena
m
e_bra
n
ch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
buil
t
in-branch: use s
t
rbuf i
n
fill_tra
c
kin
g
_
info
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
built
i
n-branch
:
u
s
e st
r
buf in
del
e
t
e_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
ik
l
os Vajna
Updat
e
Hung
a
rian
t
ranslation
.
1
00% com
p
lete
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
iklos Vajn
a
git-remote: d
o
cument the migration feature of the re
n
ame
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajn
a
gi
t
-remote
re
n
ame
:
m
igra
t
e
f
rom
r
emotes
/
and
b
ranc
h
es/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
remo
t
e:
add a new 'origin' va
r
iable to the str
u
ct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajn
a
I
m
plemen
t
git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
i
kl
o
s Va
j
n
a
upd
a
t
e
-re
f
--no-dere
f
-
d:
h
andle
t
he ca
s
e
wh
e
n
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mik
l
os Vajna
git bra
n
ch -m: forbid renaming of a sym
r
ef
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajn
a
F
i
x git upda
t
e-
r
ef --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Va
j
n
a
r
ename_ref():
ha
n
dle the cas
e
when the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
kl
o
s
Vaj
n
a
F
ix git branc
h
-m f
o
r
symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
pars
e
-o
p
t: migrate bu
i
ltin-
c
h
e
ckout-
i
n
dex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los Vajna
A
d
d test
c
ase to ensure merging an early
part of
a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linu
x
PPC support to th
e
pre-aut
o
-gc ex
a
mple hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
t
est-lib: fix c
o
lor reset in say_color
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
V
ajna
Impleme
n
t g
i
t clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Vajna
Cleanup
i
n sha
1
_file
.
c::cach
e
_or_unpack_entry(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
l
o
s Vajna
builtin-c
o
mmit: use reduce_heads() only when approp
r
i
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
V
ajna
builtin-mer
g
e:
r
efresh
t
h
e index be
f
ore calling a strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklo
s
Vajna
t7603: a
d
d new testcase
s
to e
n
sure builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
b
u
iltin-commit: use commit
_
tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
commit_
t
r
ee(): add a
new author par
a
m
eter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7
5
01: always us
e
test_cmp instead of di
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
i
kl
o
s Vajna
builtin-me
r
ge: release the lockfi
l
e in
t
r
y
_merge_s
t
rategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
los Vajna
merge-recursiv
e
: g
e
t rid o
f
virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajn
a
merge
-
recursive: mo
v
e current_{file,directory}_
s
et
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-rec
u
rsive:
m
ove the global obuf to struct
merge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
o
s
Vajna
m
e
rge-recursive: get rid of the i
n
dex
_
only glo
b
al
v
ari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos V
a
jna
m
e
rg
e
-recu
r
sive: move
call_depth t
o
stru
c
t merge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
Makefile: add mer
g
e_re
c
ursive
.
h to
L
I
B_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
ch
e
rry-pick/revert: ma
k
e direct internal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-mer
g
e: a
v
oid run
_
command_v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
merge-
r
ecursive: introduce
m
erge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split o
u
t
m
erge_recursi
v
e() to m
e
rge-rec
u
rsive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefi
l
e: enable SNPRINTF_RE
T
URN
S
_
BOGU
S
for
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git
he
l
p help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
jn
a
t9
3
00: replace '!' with t
e
st_must
_
fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos V
a
jna
Documentat
i
on:
document the
p
ager
.
*
c
onfigurati
o
n setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vaj
n
a
Bui
l
tin git-h
e
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-help: a
l
ways
load_c
o
mm
a
nd_list() in cmd_hel
p
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
Add a
s
ec
o
nd testcase fo
r
handli
n
g invali
d
strat
e
gies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add a new
t
e
s
t for using
a
cust
o
m
m
er
g
e st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
ik
l
os V
a
jna
builtin-merge:
a
llow using a custom
s
t
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
builtin-help: make
s
ome internal fu
n
ctions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601:
exte
n
d the 'merge pi
c
k
s
up t
h
e best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Va
j
na
builtin-me
r
g
e:
g
ive a proper error message for inval
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Vajna
T
e
ach 'git
m
erge' t
h
at some merge strategie
s
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
Add a new t
e
st for git-me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new te
s
t
for git-merge-r
e
sol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next