repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: refuse to merge during merge
2010-07-13
Miklos
V
ajna
format-patch: docume
n
t the format
.
to confi
g
uration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vaj
n
a
request
-
pull: avoid m
e
ntioning
t
hat the start point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
M
i
klos Vajna
gitk: Update Hungaria
n
translation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Mikl
o
s Vajna
Doc
u
ment date f
o
rmats accept
e
d b
y
parse_date()
commit
|
commitdiff
|
tree
2009-12-03
M
i
klos Vajna
builtin-commit:
add
-
-
d
ate option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklo
s
Vajna
git-st
a
sh
d
ocu
m
ent
a
tion: mention default
options for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos
V
a
j
na
g
it branch
-
D: give a better erro
r
m
essage when lockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Mik
l
os Vajna
g
it-clone: add
missing
c
omm
a
in --re
f
erence
d
o
cumen
t
ation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
M
iklo
s
V
ajna
hg-t
o
-git: don't i
m
port the unus
e
d
p
o
p
e
n
2
m
o
dule
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
git-su
b
modul
e
documentation: fix foreach
example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
git-svn docum
e
ntation:
f
ix typ
o
in '
r
ebase vs
.
p
u
ll
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
refs:
use warning() in
s
tea
d
of fprintf(stderr, "wa
r
ning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-
s
h
ow-ref: use warning
(
)
i
nstead of
f
print
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los
Vajna
builtin-show
-
br
a
nch: u
s
e warning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
bu
i
lti
n
-rm: use warning() instead of
fprintf(s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
buil
t
in-init-db: use warning() instea
d
of fprin
t
f(stde
r
r
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vajna
bu
i
ltin-f
e
tch-p
a
ck: us
e
warning()
i
nst
e
a
d
of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os Vajna
bu
i
lti
n
-checkou
t
: use wa
r
ning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-apply: use wa
r
ni
n
g() instead of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http
-
push: us
i
ng e
r
ror() and warning()
a
s appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Mikl
o
s Vajna
Test
s
:
u
s
e test_cmp instead
o
f
diff wh
e
re possi
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajna
parse-opt:
m
i
grate builtin-
l
s-f
i
les
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
M
iklos Vajna
gittuto
r
ial: remove m
i
sleadi
n
g
note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos V
a
jna
Make t3411 execut
a
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos
V
ajna
fa
s
t-export
:
print usage when no options specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
pa
r
s
e-opt: migra
t
e
builtin-app
l
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mikl
o
s
Vajna
t
9
129: skip the la
s
t three
t
ests
i
f U
T
F-8
l
ocale
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPatches: mention t
h
e
u
sage of
real
n
a
m
e in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos Vaj
n
a
g
ithooks docume
n
tation: add a note about t
h
e +x mo
d
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
i
k
l
os Vajn
a
git
-
daemon docum
e
n
t
a
t
ion: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos
Vajna
Add support for
a
pdf
v
ersion of t
h
e
us
e
r manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos
V
ajna
git-gui: Updat
e
Hu
n
gari
a
n
t
rans
l
ation f
o
r 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
h
t
t
p
.
c: us
e
'git_con
f
ig_string' t
o
get '
c
url_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule: use git
r
ev-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
l
o
s Vajna
rebase: use
git rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos Vajna
pull:
u
se
g
it rev-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-foun
d
:
u
se git r
e
v
-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
f
i
l
ter-branch: use
g
it rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
git-stash: use git rev-par
s
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mi
k
los Vajn
a
User'
s
Ma
n
ual: remov
e
du
p
licated url at the e
n
d of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
ajna
builtin_clone: use
strbuf in c
m
d
_
clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
V
a
jn
a
buil
t
in-clone
:
use strbuf in clone_local() and c
o
py_or_lin
k
_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mik
l
os Vaj
n
a
builtin-clo
n
e
: use strbuf in guess_d
i
r_na
m
e
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
i
klos Vajna
Add ne
w
te
s
tcase to s
h
ow fast-export does not alw
a
ys
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
l
os Vajna
builtin-branch: use strbuf in r
e
name_bran
c
h()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
built
i
n-branch: us
e
strb
u
f i
n
f
i
ll
_
tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
builtin-branc
h
:
u
se st
r
bu
f
in delete_b
r
anc
h
es()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
Update Hunga
r
ian
translation
.
1
0
0
% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mik
l
os Vajna
git-rem
o
t
e
:
document the migrat
i
on feature of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-r
e
mote renam
e
: migra
t
e
f
rom remotes/ and
b
ran
c
hes/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mik
l
os Vajna
rem
o
te:
a
d
d
a new
'
or
i
gin
'
variable to
t
h
e struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Imp
l
ement git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklo
s
Va
j
na
upd
a
te-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 V
a
jna
g
it
branch
-m: forbid renam
i
ng
of
a
symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vaj
n
a
Fix git update-ref --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_ref(): handle t
h
e case when t
h
e reflo
g
o
f
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Va
j
na
Fix git bra
n
ch -
m
for sy
m
refs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-opt: migrate builtin-checkout-
i
nd
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vaj
n
a
Add testc
a
se to ensure me
r
gi
n
g
a
n early p
a
rt of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los
V
ajn
a
Add
Linu
x
PPC
s
upport to
t
he pre-auto-g
c
examp
l
e
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Va
j
na
t
est-l
i
b: fix
c
o
lor rese
t
in sa
y
_color
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Implem
e
n
t
g
it
clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
C
l
eanup
i
n sha1_file
.
c::cache_or_unpac
k
_
en
t
r
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajn
a
buil
t
in-commit: use reduce_he
a
ds() only when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
V
a
jna
buil
t
in-merge: refre
s
h the index before calling a st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7
6
03: ad
d
ne
w
testca
s
es to ensure builtin-commit use
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos
Va
j
na
builti
n
-commit: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
kl
o
s Vaj
n
a
c
o
mmit_tree():
a
dd a new author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klo
s
Vajna
t75
0
1: always use test_cmp instead of dif
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mik
l
os Vajna
built
i
n-m
e
r
g
e: release the l
o
ckf
i
le in try_merge_st
r
ategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge
-
recursive: get rid of virtual_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
me
r
ge-re
c
ursive: move current_{file,dir
e
ctory}
_
set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajn
a
merge-recursi
v
e
:
move the globa
l
obuf to
s
t
r
uct merg
e
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
a
jna
merge-recur
s
i
v
e: get
r
i
d of
the in
d
ex_only global v
a
riable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajn
a
merge-recursive:
move ca
l
l_dep
t
h to stru
c
t me
r
ge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
Makefil
e
:
a
dd
merge_recursive
.
h
t
o
LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pick
/
re
v
ert
:
make direct int
e
rnal call
to merge_tree(
)
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
o
s Vajna
builti
n
-
m
er
g
e: a
v
o
i
d run_command_
v
_op
t
(
)
f
o
r recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
mer
g
e-recursive: i
n
troduce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Va
j
n
a
S
pli
t
out merg
e
_
r
e
c
u
r
sive()
t
o
merge
-
r
e
cursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile
:
enable
SNPR
I
NTF_RETURNS_B
O
G
U
S
for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jn
a
Fix 'git
he
l
p help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vaj
n
a
t9300:
re
p
lace '!'
w
i
th t
e
st_must_f
a
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos V
a
jna
Doc
u
mentati
o
n:
d
o
c
ument
t
h
e
page
r
.
* confi
g
uration
s
etting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
iklos Vajna
Bu
i
ltin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
Vajna
b
uiltin-help
:
always loa
d
_
command_list() in
c
md_he
l
p
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
Add a se
c
ond t
e
stca
s
e for h
a
ndling
i
n
v
al
i
d st
r
ategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add a
new t
e
s
t
f
or
u
sing a cus
t
o
m
m
erge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajna
builtin-
m
erge: allow u
s
ing a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos V
a
j
n
a
builtin-he
l
p: make some i
n
tern
a
l func
t
ions ava
i
lable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos V
a
jna
t7601: extend the 'merge picks up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a p
r
op
e
r error message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
l
os Vajna
T
e
ach
'
git me
r
ge' that some merge strategies
no longe
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vaj
n
a
Add
a
new test for git-merge-
r
eso
l
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
t6
0
21: add a n
e
w test
f
o
r git-merge-re
s
o
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
make remove-das
h
es: ap
p
l
y to scripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
git-bis
e
ct:
use
dash-le
s
s f
o
rm
o
n git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t1007
-
hash-object
.
sh
:
use quotes for the test d
e
scription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los
Vajna
t0001-init
.
s
h
: change
c
onfusi
n
g d
i
rectory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
uild in me
r
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next