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
Vajna
Te
s
ts: use test_
c
mp
i
nstead of diff where pos
s
ible
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2009-01-26
Miklos V
a
j
n
a
g
itt
u
tor
i
a
l
: rem
o
ve mis
l
eading note
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
Make t3411 exe
c
utable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajn
a
f
a
st-export: print usage when no options specified
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-30
Mi
k
los Vajna
parse-opt: migra
t
e
b
u
iltin-apply
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-23
M
iklos Vajna
t
9129: skip the la
s
t
three tests
if
U
TF-8 locale is
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-20
M
iklos V
a
jna
SubmittingPatches: me
n
tio
n
the usage
o
f re
a
l name in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os Vajna
g
i
thoo
k
s documenta
t
ion: ad
d
a note about
the +x
mode
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon docum
e
n
t
at
i
on: use
{
t
ilde}
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-11
M
iklos Vaj
n
a
Add support for a pdf version of the
u
ser manual
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-10
Mik
l
os
Va
j
na
git-gui: Up
d
a
t
e Hungarian translation for 0
.
12
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos
Vajna
h
ttp
.
c: use 'git_config_str
i
ng
'
to get 'cu
r
l_http_proxy'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule: us
e
g
i
t rev-pa
r
se -
q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
lo
s
Vajna
rebase: use git rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
pull: use git rev-
p
arse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
lost-found: use git rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
l
os Vajna
f
il
t
er-br
a
nch: use git rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
git-stash: us
e
git rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's Manual:
r
emove duplicated url at the
e
nd of
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bu
i
ltin_clone:
use
s
trb
u
f in c
m
d_clon
e
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
lo
s
V
ajna
b
uilt
i
n-clo
n
e:
use s
t
rbuf
in clone_local() and co
p
y
_
or_link_
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
b
uilt
i
n-clone: use strbuf in guess_
d
ir_
n
a
m
e()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-24
Miklo
s
Vajn
a
Add new testcase to sh
o
w f
a
st-expo
r
t does
n
o
t a
l
ways
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
o
s
Vajna
b
u
iltin-br
a
n
c
h: use
strbuf
i
n rename_bra
n
c
h
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Va
j
na
builtin-branch: use s
t
rb
u
f in fill
_
tr
a
cking
_
in
f
o()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
builtin-
b
ranch
:
u
se strb
u
f
i
n dele
t
e_branches(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Vaj
n
a
Update Hungarian
tr
a
nslat
i
on
.
100%
c
ompleted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
g
it-remote: document the
migration feature of the
r
e
name
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Va
j
n
a
git-remote rename
:
mi
g
ra
t
e from remotes/ and br
a
nches/
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-11
Miklos V
a
j
n
a
remote: add
a
new 'origin'
v
ariable
t
o
the st
r
uct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Imple
m
ent
g
it
remote rename
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
upda
t
e
-
ref --no-deref -d: handle t
h
e case
when the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
Mikl
o
s Vajna
git
b
ranch -m:
f
orbid r
e
na
m
ing
o
f a s
y
mref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git
updat
e
-re
f
--no-deref -
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
rename_re
f
(): handle
the ca
s
e
when the
re
f
lo
g
o
f
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Va
j
na
Fix git branch -
m
for symrefs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vaj
n
a
parse-opt
:
mi
g
r
ate builtin-ch
e
ckout-index
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
M
ikl
o
s Vajna
A
d
d tes
t
case to ensure mergi
n
g an ear
l
y part o
f
a
b
ranch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
M
i
k
l
os Va
j
na
Add Linu
x
PPC support to
t
he pre
-
auto-gc e
x
amp
l
e hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
Mi
k
los Vajna
test-lib: fi
x
color reset in s
a
y_co
l
or()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
I
m
p
lem
e
n
t
git clone -
v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s
Va
j
na
Cleanup
in sha1_file
.
c
:
:cache_or_unpac
k
_en
t
ry()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos V
a
jn
a
builtin-commit:
u
s
e reduce_heads()
o
nl
y
when a
p
propri
a
te
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
Vajn
a
builtin-merge
:
r
efresh
the
index before calling a strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add new
t
estcas
e
s to ensur
e
bui
l
tin-commit u
s
e
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: use commit
_
t
ree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
comm
i
t_tree()
:
a
d
d a new author para
m
eter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos
Va
j
n
a
t7
5
0
1: alwa
y
s use test_
c
mp ins
t
ead
o
f
diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos V
a
jna
builtin-merge: rel
e
ase the
l
ockfile in t
r
y_me
r
ge_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Va
j
n
a
mer
g
e-recursive: get rid of vi
r
tual_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
ikl
o
s Vajn
a
mer
g
e-re
c
ursive: move curr
e
nt_{file,directory
}
_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Va
j
na
merge-recurs
i
ve: mov
e
the
glob
a
l
obuf to struc
t
m
erge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
los
V
ajna
m
erge-rec
u
rs
i
ve: get
r
id
o
f the index_o
n
ly global variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Mi
k
l
o
s
V
ajna
m
erge-recursive: m
o
ve
call_depth to struct merge_opt
i
ons
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile
:
add merge_recurs
i
ve
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
cherry-pick/revert
:
make direct int
e
rnal call to
merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
i
kl
o
s Vajn
a
bu
i
ltin-
m
er
g
e:
avoid run_command
_
v_opt() for
r
ecursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos V
a
jna
merge-recu
r
si
v
e: introduce merge_
o
ption
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
S
plit out merg
e
_recursive()
t
o
merg
e
-
r
ecur
s
ive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefil
e
: enable SNPRINTF_RETURNS_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
M
i
k
los Vajna
Fix 'git h
e
lp help'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: replac
e
'!' with
t
est_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
Documentatio
n
: do
c
um
e
nt the pager
.
*
co
n
figurat
i
on se
t
ting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos
Vajna
buil
t
i
n
-
h
elp: always load_c
o
m
m
and_list()
i
n cmd_he
l
p()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d
a se
c
ond te
s
tcase
f
o
r
handling invalid
s
t
r
a
tegies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
dd a
n
ew
t
est for using a custom merge strateg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
ikl
o
s Vaj
n
a
builtin-merge: al
l
o
w
using
a custom strate
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
builtin-h
e
lp: make s
o
me inter
n
al func
t
ions available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: extend the 'merge
picks up the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos V
a
j
na
builtin-merg
e
: give a
proper erro
r
m
e
ssage
f
or
i
nvalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
M
iklos Vajna
T
e
a
ch '
g
it merge' that some merg
e
s
t
rategies no
l
onger
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
Add a new test
for
g
it-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
V
a
jna
t
6
021:
a
dd a
n
ew
test for
git-me
r
ge-resolv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os
V
a
jna
make remove-
d
ashes: apply
t
o scripts and p
r
ograms a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
l
os Vajna
git-
b
isect: use dash-less form on
g
it bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los
V
ajna
t1007
-
hash-o
b
ject
.
sh:
u
se qu
o
tes f
o
r the test description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vaj
n
a
t0001-init
.
s
h
:
ch
a
n
g
e confusing dire
c
tory name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos
Vajna
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Fix t7601-merge-pull-config
.
sh on
A
I
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
git-commit-t
r
ee
:
m
ake
i
t
usable from oth
e
r
b
uilt
i
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Add ne
w
t
est ca
s
e
to ensure
git-
m
erge
prepends
t
he
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los V
a
jna
hg-to-git
:
use g
i
t i
n
it instead o
f
git in
i
t-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-to
-
git: re
w
rite "git-frotz" to "git f
r
o
tz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-gi
t
: abort i
f
t
h
e proj
e
ct directory is not
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-git:
avoid raising a
s
t
r
ing excepti
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos
V
ajna
I
N
STAL
L
: Update sect
i
on about
g
it-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Retire 'stupid
'
merg
e
strategy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
aj
n
a
Add
n
ew test case to
e
nsure
g
it-m
e
rge reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new
te
s
t to
e
n
s
u
r
e
git-merge handl
e
s more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Introduce get_octopus
_
merge_
b
ases() in co
m
m
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
g
i
t
-
f
m
t-
m
erge-m
s
g: m
a
k
e
it usable from
other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
V
ajna
Move read_cache_unmerge
d
(
) to
r
ead-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew t
e
st to ens
u
re
git
-
mer
g
e handles pull
.
tw
o
head
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Move parse
-
o
ptions's
skip
_
prefix(
)
to git-compat-
u
til
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move commit_list_count()
t
o comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmdline() to a
l
i
a
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
a
t
h-list doc
u
mentation: document all functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
run-
c
ommand documen
t
ation:
f
i
x
"mem
s
et()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Mikl
o
s Vaj
n
a
git
-
read-tree: do
c
u
m
ent -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next
