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
builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
2009-03-24
Miklos V
a
jna
b
uilti
n
-checkout: us
e
warning
(
) in
s
tead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
builtin-apply: use warn
i
ng() ins
t
ead
o
f
fpr
i
ntf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mik
l
os
V
ajna
http-pu
s
h
:
us
i
ng error() and
wa
r
nin
g
(
) as
a
ppropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Mik
l
os
V
ajna
Tests: use test_cmp in
s
t
ead
of
d
iff where possible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mi
k
l
o
s Vajn
a
parse-opt:
migr
a
t
e builtin-ls
-
files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gittutorial: rem
o
ve mi
s
l
e
adi
n
g note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Mi
k
l
os Vajna
Ma
k
e t3411 exe
c
utable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vaj
n
a
fast-exp
o
rt: pri
n
t
usag
e
when no options specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
M
i
klos V
a
jna
p
arse-opt: migrate
builtin
-
a
pply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos
V
ajna
t9129:
sk
i
p the last t
h
r
e
e
tests if UTF-8 local
e
is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
Sub
m
ittingPatche
s
: mention the usage of real
n
am
e
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
V
ajna
githooks d
o
cumen
t
ation
:
a
dd a n
o
te about
t
he +x
m
ode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon documentation: use {t
i
ld
e
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Mi
k
los Vajna
Add supp
o
r
t
for a
pdf ve
r
sion of the use
r
manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos
Vaj
n
a
git-gui: Update Hungar
i
an translation
f
or
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c: use 'g
i
t
_
config_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
submo
d
ule: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase: use gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
pull: use git rev-p
a
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
lost-found: use git
rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-branch: use gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os
V
ajna
git
-
s
t
ash: use git rev
-
p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mi
k
l
os Vajna
User's Manual: remo
v
e d
u
plicated url
a
t the e
n
d of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
b
uiltin_clone: use strbuf
i
n
cmd_clon
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bu
i
ltin-c
l
one: us
e
strbuf in
cl
o
ne_lo
c
a
l
() and copy
_
or_li
n
k_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin
-
clone: use strbuf in guess_dir_nam
e
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos V
a
jna
A
dd
n
ew te
s
t
case t
o
s
h
ow fa
s
t-e
x
port
d
oes
not al
w
ays
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
builtin-branch:
u
se s
t
rbuf in rename_branc
h
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
bu
i
ltin-branc
h
: use strbuf in fill_tracking_in
f
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
aj
n
a
builtin-branch:
us
e
strbuf
i
n del
e
te_br
a
nch
e
s(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Update Hungarian transla
t
ion
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
ikl
o
s Vajna
git-remote: docume
n
t the mi
g
ration feature of the
r
ename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-rem
o
te rename:
m
igrate from
re
m
o
tes/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos V
a
j
n
a
r
e
m
o
te: a
d
d a new 'origin' variable to th
e
stru
c
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
i
klos V
a
jna
Implement git remote renam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos
Vajna
update-ref --no-dere
f
-d: han
d
le the case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branch -m:
f
orbid renaming of a symr
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
k
l
os Vajna
F
i
x
git
update-r
e
f
-
-no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajn
a
r
e
name_ref(): h
a
ndle th
e
cas
e
w
hen the reflog
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s Vajna
Fix git branch -m for symr
e
fs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-opt: migrate
builtin-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos Vajna
Add testca
s
e
t
o ensure merging an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
dd Linux PPC support to the p
r
e-auto-gc
ex
a
mple hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Va
j
na
t
est
-
lib: fix color reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Impleme
n
t g
i
t clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
os Vaj
n
a
Cl
e
anup in sha1_file
.
c::cache_o
r
_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Vajna
b
uil
t
in-comm
i
t:
use reduce_heads() only
w
hen
a
ppropr
i
ate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Va
j
n
a
b
ui
l
tin-merge: re
f
r
esh the in
d
ex before ca
l
ling
a
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vaj
n
a
t7603: add new testcases to en
s
u
r
e
builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vaj
n
a
builtin-commit: use commi
t
_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
ik
l
os Vajna
commit_
t
re
e
(): add a new autho
r
para
m
eter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Va
j
na
t7501: always use test_cmp in
s
tead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mi
k
l
o
s Va
j
na
builtin-merg
e
: release the
l
o
c
kfile in try_merge_strate
g
y
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
o
s Vajna
merge-recur
s
ive: get rid of virtual_
i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
aj
n
a
merge-recurs
i
ve: move
c
urrent_{file,dir
e
c
t
or
y
}_s
e
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
m
e
r
g
e-recursive: m
o
ve the glo
b
al
o
buf to
s
tr
u
ct merge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-r
e
curs
i
ve: get rid
o
f t
h
e i
n
dex
_
only g
l
obal vari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
Vajna
merge-
r
ecur
s
ive: mo
v
e
call_depth to stru
c
t mer
g
e
_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
M
a
kefil
e
: add merg
e
_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos
Vajna
cherry
-
p
ick/re
v
ert: make direct inte
r
nal c
a
ll t
o
merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
l
o
s Vaj
n
a
builtin
-
merge: avoi
d
run_command_
v
_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
erge-rec
u
r
siv
e
: introduce
m
erg
e
_opt
i
on
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
Split out merge_recursi
v
e() to
merg
e
-recursiv
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
Vajna
Makefile: en
a
b
l
e SN
P
R
INTF_RETU
R
NS
_
BOGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
ik
l
os Vajna
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
k
l
o
s Vaj
n
a
t9300:
replace '!' with test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklo
s
Vajna
Docume
n
tation: do
c
ument
t
he pager
.
*
configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos V
a
jna
Builtin g
i
t
-
help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos
V
ajna
bu
i
ltin-h
e
l
p
:
alwa
y
s
load_comman
d
_lis
t
() in cmd
_
h
e
lp()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajn
a
Add a se
c
o
nd testcase
for handling
inval
i
d strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajn
a
Add a new test f
o
r usin
g
a cust
o
m merge
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
uiltin-merge:
a
llow
using a custom
s
trat
e
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin
-
h
e
l
p
: m
a
ke s
o
me internal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t760
1
: extend the
'merge pick
s
up the best resu
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
b
u
i
l
tin-merge: give a proper er
r
or message for inv
a
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
V
ajna
Teach 'git me
r
ge' that some merg
e
strategi
e
s n
o
l
o
nger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
os Vajn
a
Add a
n
ew
t
es
t
for
g
it-merge-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new test
for git-m
e
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove
-
dash
e
s: app
l
y to scripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
git-bisect: use dash
-
less
f
orm on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Va
j
n
a
t1007
-
hash-ob
j
ect
.
sh: use quotes for the t
e
st descr
i
ptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
V
ajna
t0001-ini
t
.
s
h: change confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
os Va
j
na
Build in
m
erge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix
t76
0
1-mer
g
e-pull-conf
i
g
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tree:
m
ake it usable f
r
om oth
e
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add
n
ew test case to ensure git-merge pre
p
end
s
t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: use gi
t
init
instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
n
a
hg-to-
g
it: rewri
t
e "git
-
fr
o
tz" to "git f
r
o
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-t
o
-git: abort if the project directory is no
t
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git
:
av
o
id raising a st
r
ing exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL:
U
p
d
ate se
c
tion
a
bou
t
git
-
frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
k
los Vajna
Retire 'stu
p
id'
merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new test c
a
se to ensure
git-merge
redu
c
es octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s Vaj
n
a
Add new test to en
s
ure
git-merge han
d
le
s
more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Introduce get_octopus_m
e
rge_bases() in c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
g
it-fmt-merg
e
-msg: make it us
a
ble from
o
the
r
bu
i
ltin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move r
e
ad_
c
ache
_
unmerged() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test t
o
ensure
gi
t
-
merge handles pull
.
tw
o
head
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move parse-options's skip_pre
f
ix
(
) t
o
git-compat
-
u
t
il
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Mo
v
e
co
m
mit_list_count()
to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next