repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'pt/git-gui' into maint
2010-07-13
Miklos Vajna
format-patch
:
docume
n
t the format
.
to
configu
r
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vajna
reque
s
t-pull:
a
v
oid
m
e
ntioning th
a
t
the start poin
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Miklos Vajna
gitk: Update Hungarian
tran
s
lati
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
D
ocument
d
ate formats accepted
by parse_date(
)
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
b
u
il
t
in-commit:
a
dd --d
a
te option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
Miklos
V
ajna
git-
s
tash doc
u
mentation:
m
ention
d
efault
optio
n
s for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Miklos
Vajna
g
i
t br
a
nch -D: giv
e
a bet
t
er error message whe
n
l
ockfile
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
Miklos Vajna
git-clo
n
e
:
add missing comma
i
n --refere
n
ce documen
t
ation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vajna
hg-to-git: don'
t
imp
o
rt th
e
unused popen2 module
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
Miklos Vajna
git-sub
m
od
u
le documentation: fix foreach ex
a
mpl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos
Vaj
n
a
git-svn
do
c
ume
n
ta
t
ion: fix typo in 'rebase vs
.
pull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs: use warning() i
n
stead
o
f
f
printf(stde
r
r, "
w
a
r
ning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Mi
k
lo
s
Vaj
n
a
builti
n
-show-ref: use warni
n
g
(
) instea
d
of fpr
i
ntf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vajna
bu
i
ltin-sho
w
-
branch: use
w
arn
i
ng() instead
o
f fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bui
l
tin-rm: use warning() inst
e
ad o
f
fprintf(std
e
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
builtin
-
init-db: use
w
a
rni
n
g
(
) in
s
tead of fprintf(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
a
jna
builtin-
f
e
tch
-
p
ack: use
w
arning() instead
o
f fp
r
intf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos V
a
jna
built
i
n-ch
e
ckout: use war
n
in
g
(
)
instead of
f
printf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Va
j
na
builtin-apply: u
s
e
w
arning() i
n
s
t
ead
of fprintf(stde
r
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http-
p
ush: us
i
ng error() and w
a
rn
i
ng()
as appro
p
riate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
M
iklos Vajna
Tests: use t
e
st_cmp i
n
stead o
f
diff w
h
ere pos
s
i
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
M
i
klos Vajna
parse-op
t
: migrate builtin-ls-fil
e
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Miklos Vajna
gittut
o
r
i
a
l: remo
v
e misleadin
g
note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
Miklos Vajna
M
a
ke t3411 executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-export: print usage when
no opti
o
ns specified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Mikl
o
s Va
j
na
pars
e
-
opt: migrate builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos
Vajna
t9129: s
k
ip the last
t
hr
e
e tests
i
f
UTF-8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
M
iklos Va
j
na
Submit
t
in
g
Patches: menti
o
n
the usage of
rea
l
nam
e
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos V
a
jna
g
ithooks documenta
t
ion: add
a
n
o
te about t
h
e +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
iklo
s
Vajna
git-daemon
documentat
i
o
n
: use {ti
l
d
e
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklo
s
Vajn
a
A
d
d support for a pdf vers
i
on of t
h
e user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
M
i
k
los Vajna
g
i
t-
g
ui:
Up
d
ate Hungarian trans
l
ation
f
o
r
0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
http
.
c: use '
g
it_
c
onfig_s
t
ring'
to get 'curl_h
t
tp
_
pr
o
xy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
s
u
b
module: use git r
e
v-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
rebase: us
e
git
r
ev
-
par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
p
ull
:
use
g
it rev-p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
o
s
Vajna
lost-f
o
und: use git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-branch:
use git rev-p
a
rse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s
V
a
jna
git-stash: use git rev-pa
r
se
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
M
i
k
los Va
j
na
User's Manual: remove duplicated url
a
t the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajna
bu
i
l
t
in
_
cl
o
ne: use strbuf in
c
md_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin-clone: use strbuf
i
n clon
e
_local() and copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Va
j
na
bu
i
ltin-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
k
los Vajna
Add new testcase t
o
show fast-ex
p
o
rt does
n
ot always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
builtin-br
a
nch: use strb
u
f
i
n re
n
ame_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
los Vajna
buil
t
in
-
bra
n
ch: use
s
trbuf in fill_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklo
s
Vajna
builtin-
b
ranch:
use strbuf in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vaj
n
a
Update Hu
n
gar
i
an transla
t
ion
.
100%
c
ompleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
iklos Vajna
g
it-remote: document the migratio
n
feature o
f
th
e
r
e
name
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-r
e
mote rename: migrate
fro
m
remotes/ and b
r
a
n
ches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vajna
r
e
mote:
a
d
d a
new
'origin' va
r
iable to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mi
k
los Vajna
Implement git rem
o
te ren
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Va
j
na
u
p
date-ref --no-d
e
ref -d: handle the
c
a
se when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajn
a
git branch -
m
: forbid
renaming o
f
a s
y
mref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vaj
n
a
Fix
git update-
r
e
f
-
-
no-dere
f
-d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
V
ajna
r
ename_ref(
)
:
h
a
ndle the
case when the
reflog of
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
V
ajna
Fix git b
r
a
nch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mik
l
os Vajna
p
a
rse
-
opt
:
migrat
e
builtin-chec
k
out-ind
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testcase t
o
ens
u
re me
r
ging a
n
e
a
rly par
t
of
a
branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los Vajna
Add Linux
P
PC
support to the pre-auto-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajn
a
t
e
st-lib:
f
ix col
o
r reset in say_color
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vaj
n
a
Im
p
l
e
ment git clo
n
e
-
v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Vajna
Cleanup in sha
1
_file
.
c::cache_o
r
_
unpa
c
k_ent
r
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
i
klos Va
j
na
b
u
iltin-
c
ommit: use re
d
uce
_
heads(
)
only when ap
p
ropria
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos V
a
j
n
a
builtin-
m
erge
:
refresh the index befo
r
e calling
a
s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603
:
add
n
ew testcases to e
n
s
ur
e
builtin-commit use
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
builtin-commit:
use commit_
t
ree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
c
o
mm
i
t_tree(
)
: add
a
new author
param
e
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
t7501: alway
s
use tes
t
_cmp instead of d
i
ff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
M
i
klos Vajna
builtin-
m
erge: release
t
h
e
l
o
ckfile in try_merg
e
_str
a
tegy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-recursi
v
e: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
l
o
s
Vaj
n
a
m
erge
-
re
c
ur
s
ive: move cur
r
ent
_
{file,dir
e
c
tory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Va
j
na
me
r
ge-recursive: move
the gl
o
bal obuf to struct merg
e
_option
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Va
j
na
merge-recursiv
e
: get rid
of the index_
o
nly global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklo
s
Vajna
merge-re
c
ursiv
e
:
m
o
v
e cal
l
_depth to
struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
Makefile
:
a
d
d me
r
ge_rec
u
rsive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pick/revert:
m
ake direc
t
internal call
to merg
e
_
tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: avoid run
_
comm
a
n
d
_v_opt() for
r
ecursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
m
e
rge-re
c
ursive: intro
d
uce merge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
Split out
m
erge_r
e
cursive(
)
to merge-recursi
v
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Va
j
na
Makefi
l
e: enable S
N
PR
I
NT
F
_RE
T
URNS_
B
OGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
j
n
a
Fix
'git
h
elp help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Va
j
na
t9300:
r
eplace '!' with te
s
t
_
m
u
st_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
D
o
c
u
m
e
n
tation: docu
m
e
nt the
p
ag
e
r
.
* configuration set
t
ing
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
builtin-
h
elp: al
w
ays load_com
m
and
_
list() in cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajn
a
Add a second testc
a
se for handling invalid s
t
rategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os
Va
j
na
Add a new test for using a custom merge s
t
rat
e
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajn
a
builtin-m
e
rge: allow using a
custom st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
ltin-h
e
lp: m
a
ke some i
n
ternal functio
n
s available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mik
l
os Vajna
t7601: exte
n
d
th
e
'merge picks up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
b
u
iltin-
m
erge: gi
v
e a prope
r
er
r
or message for in
v
a
lid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los
Vajna
Tea
c
h '
g
it merge'
that some
m
erg
e
strategies no
l
onger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
o
s
Vajna
Add a new tes
t
for
g
i
t
-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajna
t6021: add
a
new test for
g
it-
m
erg
e
-r
e
s
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
m
ake r
e
m
ove-dash
e
s: a
p
p
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
-
le
s
s form
on g
i
t bisect lo
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vaj
n
a
t1007
-
h
ash-object
.
s
h
:
use quotes for the
t
est
descriptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0
001-init
.
sh: change confusing direct
o
r
y name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajn
a
B
uild
in
merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next