repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/parse-options' into next
2009-06-30
Miklos Vajn
a
git-submodule docum
e
n
t
ation: fix foreach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos V
a
jna
git-svn documentatio
n
: fix typo in 'rebase vs
.
pu
l
l
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
refs: use w
a
rning() instead of fpr
i
n
t
f(stderr, "warning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin
-
show-ref: use w
a
rning(
)
instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
b
u
ilti
n
-
show-branch: use warning()
instea
d
o
f
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
b
u
iltin-rm: use war
n
in
g
(
) instead of
f
printf(st
d
err
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
built
i
n-
i
n
i
t-db: use
w
a
rn
i
ng()
i
nstead of
fprint
f
(st
d
err
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos
Vajna
builtin-fet
c
h-pack: use warning() instead
o
f
f
p
rintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
a
jna
builtin-chec
k
out: use w
a
rning()
i
nstead
o
f
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
uiltin-appl
y
:
us
e
w
a
rn
i
ng() instead of
f
print
f
(stder
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos
V
aj
n
a
htt
p
-push:
usi
n
g
error() and wa
r
ning() as appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklo
s
Vajna
Test
s
: u
s
e
test_cmp
i
n
stead of di
f
f wh
e
re possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mikl
o
s V
a
jna
parse-opt
:
m
igrate
b
ui
l
tin-l
s
-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
M
iklos Vajna
gittutorial: remove m
i
sleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
Ma
k
e t3411 exec
u
table
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Va
j
na
fast-exp
o
rt: prin
t
usage
w
hen
no options specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
p
a
rse-opt
:
migrate builtin-a
p
p
l
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos
V
ajna
t9129: skip
t
h
e last three tests if
UTF-
8
l
ocale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vaj
n
a
Su
b
mit
t
ingPatc
h
e
s:
m
ention the usage of r
e
al nam
e
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks
d
ocume
n
tation: a
d
d
a note
abo
u
t th
e
+
x
mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Va
j
n
a
g
it-
d
aemon documentation: use
{
tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklo
s
Va
j
n
a
Add
support for a
p
df version
o
f the user manu
a
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Mik
l
os Vajn
a
git-gui: U
p
date Hungar
i
an t
r
anslation for
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
Vajna
h
ttp
.
c: use 'g
i
t_
c
o
nfig_string' to g
e
t 'c
u
rl_http_pr
o
xy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule: u
s
e git
r
ev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
rebase: use
git
rev-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
ik
l
o
s
V
ajna
p
u
ll: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
V
aj
n
a
lost-found: u
s
e git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos V
a
jna
filter-bran
c
h
: use git rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos V
a
jn
a
gi
t
-sta
s
h: use
git
r
ev-
p
a
rse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
M
i
klos Vajna
User's Manua
l
: r
e
move
duplicat
e
d url at the end o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajn
a
b
u
iltin_cl
o
ne: use strbuf in c
m
d_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
buil
t
in-clone: use strbuf
in c
l
one
_
local() and copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
a
j
na
builtin-clone: u
s
e st
r
buf i
n
guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Va
j
na
A
d
d new t
e
st
c
ase to show fas
t
-
e
xport do
e
s not alway
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklo
s
Vajna
bu
i
ltin-branch
:
use str
b
uf in
r
ename_branc
h
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
bui
l
tin-br
a
nch: use strbuf
i
n fill_trac
k
i
ng_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-bran
c
h: use s
t
rbuf in dele
t
e_br
a
n
c
hes()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s
V
ajna
Update Hunga
r
ian tra
n
s
l
ation
.
100%
c
omp
l
eted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
l
os Vajna
gi
t
-remote: document the mi
g
rati
o
n feature o
f
the re
n
am
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos V
a
j
n
a
git
-
re
m
o
t
e rename: migrate f
r
om re
m
o
t
e
s
/ a
n
d br
a
nches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
remote: a
d
d a
new 'origin' variab
l
e
to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos
V
ajna
I
m
ple
m
ent
gi
t
remote r
e
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Va
j
na
update
-
ref --no-deref -d: handle
t
he case wh
e
n
th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Va
j
na
gi
t
b
r
anch -m: forbid rena
m
ing of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s
V
ajna
Fix
g
i
t update-ref --no
-
d
eref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Va
j
na
rename_ref(): handle
the case
when the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos
Vajna
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: migr
a
te builtin-c
h
ec
k
out-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
dd testcase to
e
nsure merging an early part of a
b
ranch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux
P
PC
s
upport to the pre
-
auto-g
c
exam
p
le hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
iklos Vajna
test-lib: f
i
x co
l
or
r
ese
t
in say_colo
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Imple
m
e
n
t git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup
i
n
sha1_file
.
c:
:
c
a
c
h
e
_or_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklo
s
V
a
jn
a
bui
l
tin
-
commit: use
redu
c
e_heads() only w
h
en
a
ppropri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
b
uiltin-merg
e
:
refresh the index before ca
l
li
n
g
a
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
l
o
s Vaj
n
a
t760
3
:
add
new
t
estc
a
s
e
s to en
s
ur
e
builtin-commi
t
uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
V
a
j
n
a
builtin-commit: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
co
m
m
it
_
tre
e
(): add a n
e
w author
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
na
t7501:
a
lway
s
use
t
est_cmp
i
n
s
t
ead of
d
iff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mikl
o
s Vajna
buil
t
in-merge: release the
l
o
ckfile
i
n try_merge_
s
tra
t
egy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajn
a
merge-recursive: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
merge-r
e
c
u
r
s
i
ve:
m
ove current_{
f
ile,directory}
_
s
e
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s
Vajna
mer
g
e-recursive: move the global o
b
uf to struct merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
a
jn
a
merge-recursiv
e
: ge
t
rid of the index_only global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mi
k
los
V
ajna
m
e
rge-recursive
:
mo
v
e call_dept
h
to
s
truct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: add mer
g
e_recursive
.
h to LI
B
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
c
h
erry-pick/revert:
make direct internal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
builtin-merge: avoid
r
un_command
_
v_op
t
() for rec
u
rsive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
merge-re
c
ursive: in
t
rodu
c
e merge_
o
pt
i
ons
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klo
s
Vaj
n
a
Split out merge_recursi
v
e() to
merge-recurs
i
ve
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s Vajna
Makefile: enable S
N
PRINT
F
_RETU
R
NS_
B
OGUS for H
P
-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git he
l
p
h
elp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: replace '!'
with
test_mu
s
t_f
a
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklo
s
Vajna
Documentat
i
on: documen
t
the pager
.
* c
o
nfigurat
i
on setti
n
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Va
j
na
Builtin git-he
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
Vaj
n
a
buil
t
in-help: a
l
way
s
load_command_list
(
) in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajn
a
A
d
d a second testcase for handlin
g
i
nva
l
id strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
a
j
na
Add a new test for u
s
ing a cu
s
t
om merge st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajn
a
buil
t
i
n-m
e
rge: al
l
ow using a custom stra
t
e
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
aj
n
a
builtin-help: make some in
t
ern
a
l functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
Vajna
t
7
601: extend
t
he '
m
erge pic
k
s up the
bes
t
r
e
s
ult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builti
n
-m
e
rge: gi
v
e
a
proper erro
r
m
essage
f
or inv
a
lid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach
'git merge' that some merge stra
t
e
gie
s
n
o
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
Add a
new test
f
or
g
it-
m
erge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: ad
d
a new
t
est for
git-merge-
r
esolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
ma
k
e remove-d
a
shes: apply
to scrip
t
s and programs
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
los Va
j
na
git-bisect: use
dash-l
e
ss form on git bis
e
ct
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Va
j
na
t
1007-has
h
-
o
bject
.
sh: use quotes for
t
he
t
est descrip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
t0001-init
.
sh: ch
a
ng
e
confusin
g
directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklo
s
Vajna
Build
in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
Vajna
F
ix t7601-merge-pu
l
l-config
.
s
h
on AI
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git
-
c
ommit-tree:
make it usable f
r
om ot
h
er builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
o
s V
a
jna
Add
n
ew
tes
t
c
ase t
o
e
ns
u
re git-merge pre
p
ends
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
git: use git i
n
it inst
e
a
d
of git ini
t
-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
jna
hg
-
to-git: rewrite
"
git-frotz" t
o
"git frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-git:
a
bort if the p
r
oject directory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-
g
i
t:
a
v
o
id raising a string
e
xcep
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
IN
S
T
ALL: U
p
date section ab
o
ut git-
f
r
otz
f
orm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Retire 'stupid' me
r
ge strategy
commit
|
commitdiff
|
tree
next