repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'wp/merge-tree-fix'
2010-07-13
Miklo
s
V
ajna
fo
r
mat-patch: docu
m
ent th
e
fo
r
ma
t
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos V
a
jna
req
u
est-
p
ull: avoid men
t
i
o
ning tha
t
the start point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Miklos Vajna
gitk: Update
H
ungarian
t
rans
l
atio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
M
i
klos Vajna
Doc
u
m
e
nt
d
a
t
e
for
m
ats accepted by
p
arse_date()
commit
|
commitdiff
|
tree
2009-12-03
Miklos
Vajna
builtin-commit: add --date option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos Vajna
git-stash documentation:
men
t
ion
default optio
n
s for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
M
iklos
Vajna
g
it
b
ranch -D
:
give a b
e
tter
error me
s
sage when loc
k
f
ile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklos Vajna
g
it-clone: add
missing comma in
--reference doc
u
mentat
i
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklo
s
Vaj
n
a
hg
-
to-g
i
t: don't import the unused po
p
e
n
2
m
o
dule
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
M
iklos Vajna
git-submodule documenta
t
ion: fix foreach examp
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos V
a
jna
git-svn documentation: fix typ
o
i
n
'rebase vs
.
pu
l
l
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs: u
s
e
warning() instea
d
of fprintf(s
t
d
e
rr, "
w
arni
n
g: "
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos Vajna
builtin
-
show-ref: use
wa
r
ning() instead of
f
prin
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-br
a
nch
:
use w
a
rning() i
n
stead o
f
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
buil
t
in-rm: use
w
a
rning() instead of fprintf
(
st
d
err
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
builtin-i
n
it-db: use warning() i
n
st
e
a
d
of
f
print
f
(st
d
err
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-fetch-pack: use warning() i
n
stead of fpr
i
n
t
f
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
built
i
n
-
c
heckout:
u
se warning() instead of fpr
i
n
tf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bu
i
lt
i
n-apply: use warnin
g
() i
n
stead of fprint
f
(stde
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
k
l
os Vajna
http-
p
ush: using
e
r
r
or
(
) and
warnin
g
(
)
a
s
appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklo
s
Vajna
Te
s
ts:
use test_
c
mp i
n
stead of diff where
p
ossible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajna
p
a
rse
-
opt: migrate b
u
i
l
tin
-
ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mi
k
lo
s
V
ajna
gittuto
r
ial: remove misleadin
g
no
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
i
klos Vajna
M
a
ke t34
1
1 executa
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast
-
e
xport: print usage when no options spec
i
fied
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos
Vajn
a
parse-opt: m
i
grate builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mi
k
los Vajna
t
9
129: skip
the
l
ast thr
e
e
tests if UTF-8
l
ocale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajn
a
Submitt
i
ng
P
a
t
c
h
es
:
m
ention the us
a
g
e
of r
e
al name i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githoo
k
s documentation:
a
dd
a
note abou
t
the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon documen
t
at
i
o
n:
u
s
e {tilde
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
i
kl
o
s
Vajna
Add support for
a
pdf versi
o
n of the
user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
iklos Vajna
gi
t
-gui: Update Hu
n
gari
a
n translation for
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Mi
k
l
o
s Vajna
http
.
c: use 'git_config_strin
g
' to get 'curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submo
d
ule: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos
V
ajna
rebase:
u
se git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Va
j
n
a
pul
l
: use
g
it re
v
-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-
f
o
u
nd:
u
se git rev-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
l
os Vajn
a
fi
l
t
e
r
-
bra
n
c
h: use gi
t
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 git rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
Us
e
r's Manual:
r
e
move
d
u
p
li
c
a
ted url at
t
he end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mik
l
o
s
V
a
jna
builtin_cl
o
ne: use strbuf
in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
built
i
n-clone: use strbuf in clo
n
e_local()
a
nd copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin-clone: use strb
u
f in guess_dir_n
a
me()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
i
klos Vajna
Add n
e
w t
e
stcase to
s
how fast-e
x
port d
o
e
s
no
t
always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos V
a
jna
b
uiltin-bran
c
h: use
s
t
rbuf in ren
a
me_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-
b
r
a
nch: use
s
trbuf
i
n fill_tra
c
king_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
l
os
Va
j
na
bu
i
ltin-branch:
u
s
e st
r
buf
i
n delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos Vajna
Up
d
ate Hun
g
arian tran
s
lation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
klo
s
Vajna
git-re
m
ote: document the
migration f
e
ature of the
r
e
name
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
k
los Vajna
git-remote rename:
m
igrate from r
e
motes
/
and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Va
j
na
rem
o
te: add a
n
ew 'ori
g
i
n
'
variable to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Implement git
remo
t
e renam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
u
pd
a
t
e-ref --no-deref -d:
handle t
h
e case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branc
h
-m: forbid re
n
a
mi
n
g of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Vajna
Fi
x
g
it up
d
at
e
-ref --no-deref
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
ren
a
me_r
e
f(): hand
l
e the ca
s
e
wh
e
n
t
h
e refl
o
g of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s
V
ajn
a
Fix gi
t
branch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
M
i
klos Vajn
a
parse-opt: migrat
e
builtin-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
dd test
c
ase to ensure mer
g
ing
a
n early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Va
j
na
Add Linux PPC su
p
port to the pre-auto-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
i
k
l
o
s Vajna
test-lib: fi
x
color
r
e
set
i
n say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos Va
j
na
Impl
e
ment git cl
o
ne
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
os Vajna
Cleanup in sha1_file
.
c::cache_or_u
n
pack_entry
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
b
u
iltin-commit: use r
e
duce_heads()
o
nly when
a
ppropr
i
a
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vaj
n
a
builtin-merge:
r
efresh
the index
b
efore calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los
V
a
j
na
t7603: add
new testcases to ensure b
u
iltin-commi
t
u
ses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-
c
ommit: us
e
commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree(
)
: add
a
new author paramet
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
ik
l
o
s
Va
j
n
a
t7501: always us
e
test_cmp instead o
f
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mik
l
os
V
ajna
builti
n
-merge: release the lockfile in
t
ry_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Vajna
mer
g
e
-
recursive
:
get
rid of virtua
l
_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
a
jna
merg
e
-
recur
s
i
v
e
:
mo
v
e current_{file
,
directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
ajna
mer
g
e-recursive: move t
h
e
g
lobal obuf
to st
r
uc
t
merge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merge-
r
ecu
r
siv
e
:
get rid of the i
n
dex_only
global va
r
ia
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
me
r
ge-r
e
cursive:
move c
a
ll_dept
h
to struct
merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
Makefile: add merge_rec
u
rsive
.
h to
LI
B
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os Vajna
cherry-p
i
ck/revert: make
di
r
ect interna
l
c
a
ll to merge_t
r
ee()
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jn
a
b
u
ilt
i
n-me
r
ge
:
avoid run_command_v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recursive: i
n
trod
u
c
e
m
erge
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
Split out
m
erg
e
_
r
ecursive() to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Va
j
na
Mak
e
file: enable SNPRINTF_RETURNS
_
BOGUS for H
P
-
UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix '
g
it help
help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
iklos Vajna
t9300: replace '!'
w
ith
te
s
t_
m
ust_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos Vaj
n
a
Docu
m
entati
o
n: document t
h
e pager
.
*
c
onfiguration
s
e
t
ting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos V
a
j
na
B
uilti
n
git-he
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
bui
l
tin-help: always lo
a
d
_command_li
s
t() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Va
j
na
Add a second testcase
f
or handling invalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a
new test f
o
r using a custom merge s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s Vajna
b
uiltin-merge: allow us
i
n
g
a custo
m
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin
-
h
elp: mak
e
s
o
me interna
l
f
u
nctions avail
a
b
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s
V
ajna
t7601: e
x
tend the
'
me
r
ge pick
s
up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
los
V
ajna
builtin-merge:
g
iv
e
a
p
roper error message for inval
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Va
j
na
Teach 'git m
e
rge' th
a
t
some
merge strateg
i
e
s n
o
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a
n
ew test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021
:
ad
d
a new test for gi
t
-me
r
g
e
-
r
esolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
m
a
ke re
m
ove-dashes: apply
to s
c
ripts a
n
d programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use dash-less form on
g
i
t
bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t1007-hash
-
object
.
sh:
use qu
o
t
e
s f
o
r the t
e
st des
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
n
a
t
0
001-init
.
sh: change confusing dir
e
ctory
n
ame
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Vajna
Build
in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next