repo.or.cz
/
git
/
spearce.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/maint-pull-rebase' into maint
2009-08-04
Miklo
s
V
a
jna
h
g-
t
o
-
git: do
n
't import t
h
e unused popen2 modu
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
M
i
klo
s
Vajna
git
-
submodule documentation: fix foreach e
x
ample
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos V
a
jna
g
it-svn documentation:
fix typo
in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos
Vajna
refs: use war
n
i
n
g() instead of fprintf(
s
tderr,
"
w
a
rning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builti
n
-
s
how
-
r
ef:
use
w
arnin
g
() ins
t
ead
of fpri
n
t
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-show-branc
h
:
use warning() instead of
fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builtin-rm: use w
a
rning() instead of
f
prin
t
f(stder
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajn
a
b
uiltin-
i
nit-db: use warning() instead
of
fprintf(stder
r
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
bui
l
tin-fetch-pack:
use wa
r
ning() instead
of
f
pri
n
tf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin-
c
heckout: use warning
(
) instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
los Vajna
b
u
i
l
tin-
a
pply: us
e
warning() in
s
tead of
fprint
f
(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mikl
o
s Vajna
http-push:
using erro
r
(
) and
w
arning()
as ap
p
r
o
priate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
M
iklos
Vajna
Tests: use test_cmp instead of diff
w
he
r
e pos
s
i
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Miklos Vajna
par
s
e-opt: migr
a
te bui
l
tin-l
s
-f
i
les
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Va
j
na
gittut
o
rial:
r
e
move
m
i
sl
e
ading note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vaj
n
a
Make t341
1
exe
c
utable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklo
s
Vajna
fa
s
t-ex
p
ort
:
print u
s
age when no
options specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
p
ar
s
e-opt: migrat
e
builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mi
k
l
o
s Vajn
a
t9
1
29: skip
the last three tests i
f
UTF-8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
los Vajna
Su
b
mittin
g
Patche
s
:
ment
i
on
t
he us
a
g
e of real nam
e
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s V
a
jna
g
ithooks documen
t
a
tion: add a note about t
h
e +x
m
ode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git-daemon document
a
tion: us
e
{
t
il
d
e}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos Vajna
Add suppor
t
f
or a
p
df version
o
f the
u
s
e
r ma
n
ual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-gui:
Update Hungari
a
n translation fo
r
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Va
j
na
h
t
t
p
.
c: use 'gi
t
_c
o
n
f
ig_string' to
g
et '
c
u
rl
_
http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule:
u
se git
r
e
v-p
a
rs
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
o
s
Vajn
a
r
ebase: use git r
e
v
-
pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
aj
n
a
pull:
use
git re
v
-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost
-
found: use git rev-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
filter-
b
ranch: use git rev-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
git-stash
:
us
e
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mik
l
os Vaj
n
a
User's M
a
nual: re
m
ove
d
uplicate
d
url at the end
o
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jna
built
i
n
_
clone
:
use strbuf
i
n cm
d
_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
kl
o
s
Va
j
na
builtin-c
l
one: use strbuf in c
l
one_loca
l
(
)
an
d
copy_or
_
l
ink
_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
los Vajna
builtin
-
c
l
one:
use strbuf in
guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
M
i
klos Vajna
A
dd new testca
s
e to s
h
ow fas
t
-export does not alwa
y
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklos Va
j
na
builtin-
b
ranch: use strbuf in re
n
ame_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vaj
n
a
buil
t
in-branch: use strbu
f
in
fi
l
l_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
los Vajna
builtin-branch: use strb
u
f in d
e
lete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
U
p
d
a
te
H
ungaria
n
translatio
n
.
100% comple
t
ed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
lo
s
Va
j
na
git-
r
emote:
documen
t
the
m
igration feat
u
re of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos V
a
jna
git-remote rena
m
e
: mig
r
ate from
r
emotes/
a
nd
br
a
nches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vaj
n
a
re
m
o
t
e: add a new 'orig
i
n' variabl
e
to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Implement
git rem
o
te rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
iklos Vajna
upda
t
e
-ref --n
o
-deref -d: handle the case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Va
j
na
git branch -m
:
for
b
i
d
r
ena
m
ing of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s Vajna
F
ix
g
i
t
update-ref --no-dere
f
-d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
ren
a
me_r
e
f(): h
a
n
dle the case
w
hen th
e
reflog
of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vajna
F
i
x git branch -m for
symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos V
a
jna
parse-opt
:
migrate builtin-checkout-ind
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos
Vajna
Ad
d
t
estcase to ensure mer
g
ing
an early
p
art of
a bran
c
h
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vaj
n
a
Add Linu
x
PPC support to the pre-auto-gc
example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
iklos Vajna
test-lib:
fix color reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Va
j
na
Implement git c
l
o
ne -
v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
os Vajna
Cleanup in sha1_file
.
c
:
:cache_or_unpack_e
n
try()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
V
ajna
buil
t
in-commit: u
s
e
reduce_heads() onl
y
w
h
en ap
p
ropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos V
a
jna
bu
i
ltin-merge: refresh the in
d
ex before calling a st
r
a
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
t7603: a
d
d new testca
s
es
to ensure builtin
-
comm
i
t uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
builtin-commit: use com
m
i
t
_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
kl
o
s
V
a
j
n
a
commit_tree
(
): ad
d
a new a
u
thor parame
t
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
lo
s
Va
j
na
t7
5
01: always use test_cm
p
instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
builtin-
m
er
g
e: release the lockfile in try_
m
erg
e
_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
me
r
ge-recurs
i
ve:
get r
i
d of
virt
u
al
_
id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
rge-recu
r
sive
:
mo
v
e current
_
{f
i
le,directory}
_
set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
m
e
rge-recu
r
s
i
v
e
: move the globa
l
ob
u
f to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los V
a
jna
m
e
r
ge
-
r
ecursiv
e
:
get rid of the index_only global variabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
m
erge-
r
ecurs
i
v
e: move call_
d
ept
h
t
o struct m
e
rge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: a
d
d merge_re
c
u
r
sive
.
h
to
L
IB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
V
ajna
cherr
y
-
p
ick/revert:
ma
k
e dir
e
ct
internal call
to merge
_
tr
e
e(
)
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
b
uiltin-m
e
r
g
e:
a
v
o
id run
_
comman
d
_
v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
m
e
rge-recursive:
i
ntroduce me
r
g
e
_
o
p
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos
V
ajna
Spli
t
out merge
_
rec
u
rsive() to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
a
jna
Makefile: enable SNPRINTF_RETURNS
_
B
O
GUS f
o
r HP
-
U
X
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
Miklos Vajna
t9300: repla
c
e '!' wit
h
test_must
_
fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documen
t
ati
o
n: document the pager
.
* conf
i
gurati
o
n setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
i
klos Vajna
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin
-
help: al
w
ays
load_command_list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add a se
c
ond testc
a
se for handling invalid strat
e
gie
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a
n
ew tes
t
f
o
r using a custom m
e
rge strat
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
l
o
s Vajna
builti
n
-merge: allow usin
g
a cu
s
tom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
b
u
iltin
-
help: make some internal
f
unctio
n
s available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mik
l
os Vaj
n
a
t760
1
:
ex
t
end the 'merge picks u
p
th
e
best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Va
j
n
a
builtin
-
merge: giv
e
a
pro
p
e
r
error message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los Vajna
Teach 'git merge' that some merge st
r
ategies no
lo
n
g
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a
n
ew te
s
t for git-me
r
ge-re
s
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a ne
w
t
e
st for gi
t
-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
m
a
ke re
m
o
ve-dash
e
s: apply to scripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
git-bise
c
t:
u
se dash-les
s
form
o
n git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t10
0
7-hash-object
.
s
h
:
u
se quotes for the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
t0001-init
.
sh: change confusing direct
o
ry name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
M
ik
l
o
s Vajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
ajna
Fix t7601-merg
e
-
pull-c
o
nfig
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
git-c
o
mm
i
t-tree: make it us
a
ble from oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Vajna
Add
n
ew
test c
a
se to ensure
g
it-m
e
rge pr
e
p
ends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
hg-to-git: use
git init instead of g
i
t init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklo
s
Vajna
hg-to-git:
r
ewrite
"
git
-
frotz" to "g
i
t frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
:
abo
r
t if the project
d
irect
o
ry is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
git:
avo
i
d
r
ais
i
ng a st
r
ing excepti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: U
p
date section about git-frotz fo
r
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next