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
Tests: use test_cmp instead of diff where possible
2009-03-17
Miklos Vajn
a
T
ests:
use test_c
m
p in
s
t
ead of diff whe
r
e possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
g
ittuto
r
ial: remove mis
l
eading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
i
klos Vajna
M
a
ke t3411 executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
M
i
k
lo
s
Vajna
fast-e
x
po
r
t
:
pri
n
t us
a
ge whe
n
no o
p
tions specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Mi
k
los
V
ajna
parse-opt: mi
g
rate
bui
l
t
i
n-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklo
s
Vajna
t9129:
skip the last three tests if UTF-8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
SubmittingPatches: mention the usage
of real name i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
Vajna
githo
o
ks documentation: a
d
d
a note
a
bout t
h
e +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os Vajna
git-daemon documentation: us
e
{tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos
V
aj
n
a
A
dd
s
uppo
r
t
f
o
r
a pdf version of th
e
us
e
r m
a
n
u
al
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklo
s
Vaj
n
a
git-g
u
i: Update Hungarian translation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos Vajna
htt
p
.
c
: use 'git_config_s
t
r
ing' to get 'curl_http_
p
r
oxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule:
use git
r
ev
-
pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
reb
a
se: u
s
e git rev
-
parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
los
Vajna
pull: us
e
git rev-parse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos
V
ajna
lost-found: use
g
it re
v
-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-br
a
nch:
u
se g
i
t re
v
-
pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
git-stash: use git rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mik
l
os V
a
j
n
a
User's Manual:
r
emove duplic
a
ted
url
a
t the end
o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin_clone: use strbuf in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Va
j
na
builtin-c
l
on
e
:
use strbuf in clo
n
e_loca
l
() an
d
c
opy_o
r
_l
i
nk_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
ajna
bui
l
t
i
n-c
l
one: us
e
strbuf i
n
gues
s
_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Va
j
n
a
Add new testcase to
s
how fast-e
x
port does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
buil
t
i
n
-branch: use strbuf i
n
re
n
ame_
b
ranch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
u
iltin-br
a
nch: us
e
strbuf in fill
_
t
racking_
i
nfo()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklo
s
Vajna
bui
l
tin
-
branch
:
u
se strbu
f
in delete_branches(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
Vajna
Update Hungar
i
an
t
ransl
a
t
i
on
.
100
%
com
p
l
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote: documen
t
the migration feature of the re
n
ame
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
klos Vajna
g
it-remote rename: mi
g
rate from remo
t
es/ and branche
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
remote: a
d
d a new 'origin' va
r
iable to the
st
r
uct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Impleme
n
t
g
it
remote r
e
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vaj
n
a
update-ref --no-deref -d: handle the case
w
h
e
n the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branch -m
:
forbid renamin
g
of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
Fix git
u
pdate
-
re
f
--no-deref
-d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Va
j
na
rena
m
e_re
f
(): hand
l
e the c
a
s
e
when the
reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Va
j
na
F
i
x g
i
t branch -
m
for symr
e
fs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vaj
n
a
p
arse
-
opt: migrate
b
uilt
i
n-che
c
ko
u
t-i
n
dex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos Vajna
Add test
c
ase
t
o ensure mer
g
i
ng
a
n early part of
a
br
a
nch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
Ad
d
Linux
P
PC support t
o
the pre
-
auto-gc
example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib: fix color reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajn
a
I
mplement
git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
V
a
j
na
Cleanup
in sha1_file
.
c::
c
ache_or_unpack_
e
ntry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklo
s
V
a
jna
bu
i
lti
n
-commit
:
u
se reduce
_
heads() only when a
p
propri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-mer
g
e: refresh
t
h
e
index b
e
fore calli
n
g a
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos Vajna
t7603:
a
dd ne
w
test
c
ases to ensure builtin-commit
u
ses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
builtin-commit:
use commi
t
_
t
ree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
o
s
Vajna
c
o
m
m
it_t
r
ee(): a
d
d
a new author p
a
rameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
l
os Vajna
t
7
5
01: always u
s
e test_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos V
a
j
n
a
builtin-merge: release the
lockfile in t
r
y
_
merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-
r
ecurs
i
ve: get r
i
d of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
m
erge-recursive: move c
u
rrent_{fil
e
,
d
irecto
r
y}_se
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Va
j
na
m
erge-re
c
ursive: mo
v
e the global obuf to struct
merge_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-recursive: get r
i
d
of the index_only
globa
l
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mi
k
l
os Vajn
a
m
erge-recursive: move cal
l
_
depth
to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
Mak
e
file: add
merg
e
_recursive
.
h
t
o LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
c
h
erry-pi
c
k
/revert:
m
ake direct
i
n
t
ernal call
to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
l
os Vajna
b
uilti
n
-merge: avoid
r
un_command_v_opt()
fo
r
recursi
v
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
mer
g
e
-r
e
cursive: i
n
trod
u
ce merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
j
na
S
p
lit out merge_recu
r
sive() to
mer
g
e-recu
r
si
v
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
Vajna
Make
f
i
le: enable SNPRINTF_RETUR
N
S_B
O
GUS for
H
P-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
Vajna
t9
3
00: re
p
lace
'
!' wi
t
h t
e
st_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos Vajna
Documentation: docu
m
ent the pag
e
r
.
*
conf
i
guration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
ui
l
t
in g
i
t-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mikl
o
s
V
ajna
builtin-help: always load_
c
ommand_list() in cmd_
h
elp(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos
V
a
jna
Ad
d
a secon
d
testc
a
se for
h
andl
i
n
g
invalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a new test for using a custom merge stra
t
eg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
uiltin-m
e
rg
e
: allow using a c
u
s
tom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
builtin-help: make some
i
nter
n
al functio
n
s
av
a
ilable
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t760
1
: extend
t
he 'merge picks up
t
he best
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vaj
n
a
bu
i
ltin-merge: give
a
proper error me
s
sa
g
e
f
or inva
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach
'
git merg
e
' that some
m
erge
s
tr
a
t
eg
i
es no l
o
n
g
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los Vajna
Add a
new
test for gi
t
-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new
t
est
f
o
r git-merge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
lo
s
Vajna
make rem
o
ve-d
a
shes: app
l
y
t
o scripts and pro
g
rams as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
gi
t
-bi
s
e
c
t: use da
s
h-less fo
r
m
on git b
i
se
c
t
l
og
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los V
a
jna
t1007-h
a
sh-object
.
sh
:
use quotes for the
t
est de
s
cri
p
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-in
i
t
.
s
h
:
change confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los Vajna
Build in
m
e
r
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos V
a
jna
Fix t7601-
m
erge-pull-con
f
ig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-
t
r
e
e: make
it
u
s
able from oth
e
r
b
uiltin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
A
dd new test case to
ensure gi
t
-merge prep
e
nds the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klo
s
Vajna
hg
-
to
-
git: u
s
e gi
t
init inste
a
d of
git
i
nit-
d
b
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-git:
r
ewrit
e
"g
i
t-fro
t
z" to "git fr
o
tz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los
Vajna
hg-to
-
git: abort if t
h
e project directory i
s
no
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
ikl
o
s
Vajna
hg-to-git: avoid raising a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os V
a
jn
a
I
NSTALL: U
p
d
a
te
s
ect
i
o
n about
gi
t
-frotz for
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire '
s
tupid' merg
e
s
t
rat
e
gy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new t
e
s
t case
t
o ens
u
re git
-
mer
g
e reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jn
a
Add
n
ew test to ensure
g
it-merge
h
andle
s
more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
In
t
rod
u
c
e get_octopus_merge_bases() in
c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
jn
a
git-fmt-merg
e
-msg: make it usable f
r
o
m
o
ther buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Va
j
na
Move read
_
cache_u
n
me
r
ged() to
r
ea
d
-c
a
che
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Add new
test to ensure git-merge
h
a
ndles pull
.
t
w
ohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
p
arse-opt
i
ons's ski
p
_prefix() to git
-
compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move commit_li
s
t_count() to c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
M
o
ve
s
plit_cmdline
(
) to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
a
th-list documentation: document all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
run-c
o
mmand d
o
cu
m
entation: fix "m
e
mset()" p
a
ram
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
V
a
jna
gi
t
-
r
ead-tree: d
o
cum
e
nt -
v
option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next