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/show-ref-parse-options'
2009-06-30
Miklos
V
ajna
g
i
t-submodule documentation:
fix foreach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos Vajna
git
-
svn
documentatio
n
: fix typo in 'rebase v
s
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs
:
use w
a
rn
i
ng() instead of fprintf(std
e
rr, "warni
n
g
:
")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
builtin
-
s
h
o
w
-ref: use warning() ins
t
ead of fprin
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vajna
builtin-show-br
a
n
c
h
: use w
a
rni
n
g() instead o
f
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-rm:
u
se warning
(
) inst
e
ad
o
f
f
printf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-in
i
t-db: use warnin
g
(
)
instea
d
of fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bu
i
ltin-fetch-pack: use warning() instead of
fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos V
a
jna
builtin-ch
e
ckout: use w
a
rning() instead of fp
r
int
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos Vajna
builtin
-
a
pply:
u
s
e
w
ar
n
i
n
g
(
)
ins
t
ead o
f
f
p
r
i
ntf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
h
ttp
-
push: using erro
r
()
a
nd
w
arning() as appropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
M
i
klos Vajna
Te
s
ts: use
t
es
t
_
c
mp instead of diff wher
e
poss
i
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mi
k
lo
s
Vaj
n
a
parse-opt: migrate
builtin-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos
Vaj
n
a
gittutorial: remov
e
mi
s
leading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
Make t341
1
executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-expor
t
: pri
n
t
u
s
a
ge
w
hen no opt
i
ons sp
e
c
i
f
ied
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
parse-opt: migrate bui
l
t
in-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t
9
129: skip the last three tests if U
T
F-8 lo
c
ale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
M
i
klo
s
V
ajn
a
SubmittingPa
t
ches: m
e
ntion
t
he
usage of r
e
al name
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks documentation
:
add a no
t
e
about the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
l
o
s Vajna
git-daemon documentation: use
{
tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
ik
l
os Vajna
Add sup
p
or
t
for a pdf version of the us
e
r manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-
g
u
i
:
U
p
da
t
e
Hungarian tran
s
lation
f
or
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Va
j
na
h
ttp
.
c: us
e
'g
i
t_con
f
ig_string' to
get 'curl_ht
t
p_pr
o
xy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodu
l
e:
u
se git
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
rebase
:
use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s
V
ajn
a
pu
l
l: use g
i
t rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
l
o
st
-
foun
d
: use git rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
ikl
o
s Vajna
fil
t
er-branc
h
:
u
se git rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Va
j
na
git-stash
:
u
s
e git rev-par
s
e -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos V
a
jn
a
User's Manual: remove duplicated ur
l
a
t
the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos Vajna
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
Vaj
n
a
b
u
iltin-clone: us
e
strbuf in
clo
n
e_lo
c
a
l
() and copy_o
r
_l
i
nk_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin-c
l
one
:
use strbuf in
g
uess_di
r
_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajn
a
Add ne
w
testcase to show fast-exp
o
rt does not alwa
y
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos V
a
jna
builtin-branch:
use strbuf
in rena
m
e_branch(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builti
n
-
b
r
a
nch: use strbu
f
i
n fill_t
r
acking_
i
nfo()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
ikl
o
s Vajna
builtin-branch: u
s
e
strbuf
i
n delet
e
_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Update Hungari
a
n translatio
n
.
100
%
complet
e
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
iklos
Vajna
g
i
t-remo
t
e: document the migratio
n
featur
e
of t
h
e ren
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mikl
o
s Vajna
git-remote r
e
name: migr
a
te
from re
m
otes/ a
n
d branche
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
rem
o
te: a
d
d a
new 'origin' variab
l
e
to the
s
truct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Implemen
t
g
i
t remote
r
en
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Va
j
na
update-
r
ef --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
V
a
j
na
git
b
r
a
n
ch -m: forbi
d
re
n
am
i
ng of a sym
r
ef
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s
V
ajna
Fi
x
git update-ref --no-de
r
e
f -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
ik
l
os Vajna
rena
m
e_ref(): handle
the ca
s
e
w
h
en the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
Fix
g
it branch -
m
for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos
Vajna
parse-opt:
m
igrate
b
uiltin-c
h
eckout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testcase to ensure mergin
g
an early part
of
a
br
a
nc
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
Ad
d
Linux PPC supp
o
rt to
t
he
pre-auto
-
gc
e
xa
m
p
l
e
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
t
e
st-l
i
b
: fix color re
s
et in say_colo
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Va
j
na
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::
c
ache_or_unpack_entr
y
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos Vajna
buil
t
i
n
-
commit: use redu
c
e_heads() onl
y
when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-merge: refresh
the i
n
dex
b
efo
r
e cal
l
i
n
g a st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: ad
d
ne
w
t
e
stcases to ensure builtin-c
o
m
m
it uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Vajna
builtin-commit: use commi
t
_tre
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s
Vajna
commit_t
r
ee():
a
d
d a new author para
m
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t
7
5
0
1: a
l
w
a
ys use t
e
st_cmp instea
d
of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vaj
n
a
builtin-merge: release the lockfile in try_merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
merge-r
e
c
u
r
s
ive: get rid
of virtual_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos V
a
jn
a
merge-recur
s
i
v
e: move current_{file,direc
t
ory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
a
j
n
a
merge-recursive: move the global obu
f
to struct mer
g
e_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recu
r
s
i
v
e
:
ge
t
r
id of the index_only global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vaj
n
a
merg
e
-recursive: move call_d
e
pth
t
o
struct merg
e
_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os
Vajna
Makefile: add me
r
ge_r
e
cur
s
ive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
lo
s
Vajna
cherry-p
i
ck/revert: make
dir
e
c
t
interna
l
call to merge_tre
e
()
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
los Vajna
b
u
iltin-merge
:
avoid run
_
command_
v
_opt
(
) f
o
r recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Va
j
na
m
erge-recur
s
ive
:
intro
d
u
ce merge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out merge_recurs
i
v
e
() to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Ma
k
efile: e
n
a
b
le SNPRI
N
TF_RETUR
N
S_BOGUS 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
iklos Vajna
t9300: re
p
lac
e
'!'
w
ith test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
iklo
s
V
a
jna
Documentation: d
o
cum
e
nt
the pager
.
*
c
onfiguration settin
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
i
klos Vajna
Builti
n
g
i
t-
h
elp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos V
a
jna
b
u
iltin-help: always load_command_
l
is
t
() i
n
c
m
d_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
a
j
na
Ad
d
a
second testcase for handli
n
g invalid
s
t
r
at
e
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
Add a new test for using a cust
o
m merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
builtin-merg
e
: all
o
w us
i
ng a custom
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-help: mak
e
s
om
e
int
e
rnal functions a
v
a
ilable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t760
1
: extend the
'
me
r
g
e picks u
p
th
e
best resu
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
bu
i
ltin-merge: give a proper error
mes
s
a
g
e for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teac
h
'gi
t
merg
e
'
that
s
ome merge
s
trategi
e
s
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los V
a
jna
Add
a
new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
l
o
s Vajna
t6021
:
add a
n
ew test for git-merge-
r
e
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
make remov
e
-dashes: apply to s
c
ripts and
p
rograms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
git-bise
c
t: use dash-less fo
r
m
o
n
git
bisect l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t
1007-hash-object
.
sh: use
q
u
otes
for t
h
e test descr
i
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-i
n
it
.
sh: change
c
onfusing directory na
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
uild in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Fix t7601-m
e
rge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
git-commit-t
r
ee: make it u
s
able from othe
r
b
u
ilti
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
A
d
d new t
e
s
t case to en
s
ure git-merge pr
e
pends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: use git ini
t
instea
d
of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
l
o
s Vajna
h
g-
t
o
-git:
r
ewrite "git-
f
rotz" to "g
i
t frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
git: a
b
ort
i
f the p
r
oject
d
irectory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s
V
ajna
h
g-to-git: avoid rais
i
ng
a
string exc
e
pt
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
ikl
o
s Vajna
INST
A
L
L
: Update section a
b
out git-f
r
o
t
z form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos V
a
jna
Retire
'
s
t
u
p
id' merge strategy
commit
|
commitdiff
|
tree
next