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 'rc/maint-http-local-slot-fix' into maint
2009-06-21
Mikl
o
s Vajna
git-svn documentation: fix typo in
'reba
s
e vs
.
p
ull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
re
f
s:
u
se war
n
ing() inst
e
ad of
fprintf(stderr,
"
w
a
rning:
"
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s V
a
jna
b
uiltin-show-
r
ef:
u
s
e
wa
r
ning() instead
o
f fprin
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-bra
n
ch: use
w
arn
i
ng() inst
e
a
d
o
f
fprin
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
ajna
b
uiltin
-
rm
:
use warning() inst
e
ad of
f
p
r
in
t
f(s
t
derr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
iklos Vajna
b
u
iltin-init-db:
u
se warning()
i
n
s
tead of
f
pr
i
ntf
(
s
t
derr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
b
u
ilt
i
n-fetch-pack
:
use warning() inst
e
ad o
f
fp
r
intf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
o
s
Vajna
bu
i
ltin-c
h
eckout:
u
se w
a
rning() i
n
stea
d
of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vajna
builtin
-
apply: u
s
e
war
n
in
g
() instead o
f
fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http
-
push: usin
g
error() and wa
r
ning(
)
as app
r
o
priate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Vajna
Te
s
ts: use test_c
m
p
instead of d
i
ff where possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mi
k
los Vajna
parse-opt
:
migr
a
te bu
i
ltin-ls-files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gittutorial: re
m
ove misleading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos V
a
jna
Make t
3
411 execu
t
able
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos
Vajna
fast-export: print usage
when no o
p
tions
s
pecified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vaj
n
a
parse
-
op
t
: migra
t
e builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
M
iklos
Vajna
t9129:
s
kip the last three tests if
U
TF-8 loc
a
le i
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
los
V
ajn
a
Su
b
mittingPa
t
ches: m
e
n
t
ion the
usage
of real name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklo
s
Vajna
gith
o
oks documentation:
a
d
d
a n
o
te a
b
o
u
t
the
+
x mod
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
l
o
s Vajn
a
git
-
daemon
do
c
umentation: use {t
i
lde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajn
a
Add suppor
t
for a pdf ve
r
si
o
n
of the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos V
a
j
n
a
git-gu
i
: Update
H
ungarian trans
l
ation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Mi
k
l
o
s
Vajna
htt
p
.
c: use 'git_config_string' to ge
t
'cu
r
l_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
sub
m
odule: use 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
M
iklos Vajna
pul
l
: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-found:
u
s
e git re
v
-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
filter-bra
n
ch: use git
rev-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s V
a
jna
git-stash: use
g
it rev-
p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's Manual:
remove du
p
licated url at
t
he end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mikl
o
s Vajna
builtin_
c
lone: use str
b
uf in c
m
d_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bu
i
ltin-clon
e
: use strbuf in cl
o
ne_
l
ocal() and
c
opy_or_lin
k
_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos
Vajna
bui
l
tin-clone
:
use
strbuf in guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
i
klos Vajna
Add
n
ew te
s
t
case
to s
h
o
w
fas
t
-export does not a
l
ways
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
o
s
Vajna
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
built
i
n-
b
ranch:
u
se strbuf in fil
l
_tracking_info
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-bran
c
h:
u
se s
t
rbuf in de
l
ete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
Vajna
Update Hungari
a
n t
r
anslation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mikl
o
s Vaj
n
a
git-remote
:
document the migra
t
ion feature of the renam
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
l
os Vajna
git-
r
emo
t
e
rename: migrat
e
from re
m
otes/ a
n
d branch
e
s/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mi
k
los Vajna
re
m
ote: add a
new 'or
i
gin' vari
a
ble to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
iklos
Vajna
Im
p
lement git remot
e
rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Mi
k
los Vajna
update-r
e
f -
-
no
-
d
e
ref -d: handl
e
t
h
e case when th
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branch -
m
: fo
r
bid rena
m
i
n
g of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
Fix git update-ref --n
o
-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_r
e
f(): han
d
l
e
t
h
e
cas
e
when the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vajna
F
ix
g
it branch -m for sy
m
refs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
p
arse-opt:
m
igrate builtin-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vaj
n
a
Add testc
a
se to ens
u
re mergin
g
an e
a
rly part
of a b
r
anch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linu
x
PPC
support to
the pre-auto-g
c
example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
i
klos Vajna
test-li
b
: fix color re
s
et in sa
y
_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos Vaj
n
a
I
m
p
l
e
m
ent git clone
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Va
j
na
Cleanup in
s
h
a1_file
.
c
::cache
_
o
r
_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklo
s
Vajna
b
u
iltin-commit:
use
r
educe_head
s
()
o
nly when appr
o
priate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajn
a
builtin-mer
g
e
: refresh
the index before calli
n
g a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Va
j
n
a
t7603: add new tes
t
ca
s
e
s
to ensur
e
builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use
commit_tre
e
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
ikl
o
s Vajna
commit_tree():
a
d
d
a
ne
w
aut
h
or param
e
t
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Vajna
t750
1
: always u
s
e t
e
s
t
_cmp
instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos
V
ajna
buil
t
in-mer
g
e:
release the
l
ockf
i
l
e
in
t
ry_me
r
ge_strateg
y
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Vajn
a
merge-recursive: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive:
m
ove current_{file,directo
r
y}
_
set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
mer
g
e-recur
s
iv
e
:
move the global ob
u
f to str
u
ct merge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-re
c
u
r
sive: g
e
t
rid of the
i
n
d
ex_only glob
a
l variabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
m
erge-
r
ecursive: move
c
all
_
d
e
p
t
h t
o
struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
M
a
kefi
l
e
:
add
merge
_
recu
r
sive
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
c
h
erry-pick
/
r
e
ver
t
: make dir
e
ct internal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
V
ajna
b
u
iltin-merge: av
o
id run_
c
om
m
and_v_op
t
() fo
r
recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Va
j
na
merg
e
-recursive: introduce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los
V
aj
n
a
Split out merge
_
re
c
u
r
sive() to merge-recu
r
s
ive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enable SNPRINTF
_
R
E
T
URNS_BOGU
S
for
H
P-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
ajna
Fix '
g
i
t
help h
e
lp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
los
V
ajna
t9300: replace
'
!
' with te
s
t_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
D
ocu
m
ent
a
t
i
o
n
: document the pager
.
*
c
onfiguration s
e
tting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
u
iltin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mi
k
lo
s
Vajna
builtin-help: always load_com
m
and_lis
t
(
)
in cmd_h
e
l
p
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajn
a
Add a se
c
ond testcase fo
r
h
a
ndling i
n
va
l
id strat
e
gies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
aj
n
a
Add a new te
s
t f
o
r u
s
in
g
a custom me
r
ge st
r
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
builtin-mer
g
e: allow using a
cu
s
tom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builti
n
-help: make
s
o
me internal fu
n
ctio
n
s
ava
i
lable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
iklos
Va
j
na
t
7
601: ext
e
n
d
t
h
e 'm
e
r
g
e picks u
p
t
h
e best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a proper error me
s
sage for in
v
a
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Te
a
c
h
'
git merge' th
a
t
some
m
er
g
e strategies
n
o longe
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a
n
ew test for git-m
e
rge
-
re
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a
n
ew test fo
r
gi
t
-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
make r
e
m
ove-dashes:
a
pply to
scripts and p
r
o
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
l
os
V
a
j
n
a
gi
t
-
bisect: use dash-les
s
form on git bis
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t1
0
07-ha
s
h
-
obje
c
t
.
s
h:
u
se q
u
o
tes
f
or the test
d
escription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t0001
-
init
.
sh: c
h
ange confusin
g
directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos V
a
jn
a
Build
i
n merg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
ik
l
os Vajn
a
Fix t7601-merge-pull
-
confi
g
.
sh on
A
IX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tree: make it usabl
e
from
other buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jn
a
Ad
d
new test
c
a
s
e to ensure git-merge
p
r
epends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
h
g
-to-gi
t
: use g
i
t
init ins
t
ead of
git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
ik
l
o
s Va
j
na
hg-to
-
git: r
e
write "git-fro
t
z" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-
t
o-git: abo
r
t if
t
h
e
projec
t
d
i
rectory
is
n
ot
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vaj
n
a
hg-to-
g
i
t: avoid raising a string
e
x
c
e
pt
i
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: Update
section about git-
f
rot
z
form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 'stupid'
m
erge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajn
a
Add ne
w
te
s
t
cas
e
to ensure
g
it-merge red
u
ces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next