repo.or.cz
/
git
/
dkf.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
V
ajn
a
format-patch
:
documen
t
the
fo
r
mat
.
to con
f
iguratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-30
Miklos Vajna
request
-
pull: avoi
d
m
e
ntioning
tha
t
the start point
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2010-01-12
Mik
l
o
s
Vajna
gitk:
U
pdate
H
ung
a
r
i
an tr
a
nslation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-12-03
Miklos Vajna
Docum
e
n
t
date formats accepted by p
a
rse
_
date()
commit
|
commitdiff
|
tree
2009-12-03
Mi
k
los Vajna
bu
i
lti
n
-commit: add --d
a
t
e
option
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-10-12
M
iklo
s
Vajna
git-
s
tash documentation:
m
ention d
e
fault
o
ptions for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-29
Mik
l
o
s
V
a
jna
git bran
c
h -D: give a bett
e
r er
r
or
m
e
s
s
ag
e
when lockf
i
le
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-09-03
M
i
k
los Vajna
git-c
l
one: add missing comma in --reference documentation
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-08-04
Miklos Vaj
n
a
hg-to-git: don't
i
mport the un
u
sed popen2 mod
u
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-30
M
i
k
l
o
s Vajna
git-su
b
mo
d
ule do
c
umen
t
ation: f
i
x foreach example
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-06-21
Miklos V
a
jna
git
-
s
vn docu
m
e
n
t
a
t
ion: fix typo in 'reb
a
s
e vs
.
p
ull
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
refs: use
warn
i
ng() inste
a
d of fpri
n
tf(s
t
derr, "w
a
rning: ")
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
Vajna
bui
l
tin-sho
w
-ref: use
warni
n
g()
i
n
st
e
ad of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos
V
a
j
na
builtin-show-branch: use w
a
rning() instea
d
o
f fprint
f
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
Vajna
b
u
ilti
n
-rm: use wa
r
ni
n
g() instead of fprintf(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklo
s
V
ajna
b
u
i
l
t
i
n-init-db
:
us
e
war
n
ing() i
n
stead of fprin
t
f(stderr
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
bu
i
l
tin-
f
etc
h
-pac
k
: use
warning()
instead of fprintf
.
.
.
commit
|
commitdiff
|
tree
2009-03-24
M
i
klos Vajna
bui
l
ti
n
-c
h
ecko
u
t
: use w
a
r
ning() instead of fprintf
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos
V
aj
n
a
built
i
n-apply: use wa
r
ning() ins
t
ead of fprin
t
f(stderr
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-24
Miklos Vajna
http-push: u
s
i
n
g erro
r
(
)
an
d
wa
r
ning() as appropri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-03-17
Miklos Va
j
na
Tests: u
s
e
t
est_cmp
instead
o
f
diff w
h
ere pos
s
ible
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-02-18
Mi
k
los
Vajna
parse-op
t
: migrate builtin-ls
-
files
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-26
Mi
k
l
o
s Vajna
gitt
u
torial:
r
emove mi
s
l
e
a
d
i
n
g note
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-15
M
i
klo
s
Vaj
n
a
Mak
e
t3411 e
x
ecutabl
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-export: print usag
e
when no options
s
pecified
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
pars
e
-opt: migra
t
e builtin-apply
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mik
l
os Vajna
t9129
:
s
k
ip the
l
a
s
t
thre
e
tests if UTF
-
8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Miklo
s
V
a
jna
SubmittingPatches: me
n
tion the usa
g
e of
r
eal n
a
me in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
o
s Vajna
githooks do
c
umentation:
ad
d
a note about th
e
+x m
o
de
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
Vajn
a
git-daem
o
n documentation: use
{tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
M
i
klos V
a
j
n
a
Add support
f
or a pdf version of the user manual
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Mi
k
los Vajn
a
git-
g
ui: Update Hung
a
ria
n
translation for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
i
klos Vajna
htt
p
.
c: use 'git_config_string' t
o
get 'curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodul
e
:
u
se gi
t
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase:
use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Va
j
na
pu
l
l:
use git rev-p
a
rse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
l
ost-found: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vaj
n
a
filter-branch
:
u
se git rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
los
Vajn
a
g
it-s
t
a
s
h:
use
git rev
-
pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
M
i
k
lo
s
Vajna
U
ser's Manual: remove duplicated url a
t
th
e
end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vaj
n
a
bui
l
tin_clo
n
e:
use strbuf in cmd_clo
n
e
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
V
ajna
builti
n
-c
l
one:
u
se str
b
uf
in clone_local() and copy_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builtin-clone: use strbu
f
in guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add
new t
e
stcase to show
fast-
e
xpor
t
does not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
bui
l
tin-br
a
nch: us
e
strb
u
f in rename_branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
ui
l
tin-branch: use strb
u
f i
n
f
ill
_
tracking_in
f
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
V
ajna
builtin-branch: use strbuf in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klo
s
Vajna
Update Hungari
a
n
t
ran
s
lation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
klos Vaj
n
a
git-remote
:
documen
t
the migratio
n
fea
t
u
r
e of the ren
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Mi
k
los V
a
jna
g
it-remote ren
a
m
e
: m
i
gr
a
te from rem
o
tes/ and bran
c
hes/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
M
i
klos Vajna
r
e
mote: add a new 'origin
'
variable
t
o the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
i
klos Vajna
Imple
m
ent
g
i
t
r
emote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos V
a
j
na
up
d
a
t
e
-r
e
f -
-
no-deref -d:
handle the c
a
se w
h
e
n
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mik
l
os Vajna
gi
t
b
ranch -m: forbid renamin
g
of a
symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
F
i
x git update
-
ref --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajn
a
renam
e
_r
e
f
(): handle
t
he case
w
hen th
e
reflog
of
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
Fix git branch -m for sym
r
ef
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajn
a
parse-opt: migrate bui
l
tin-checkout-inde
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Ad
d
testcase
to e
n
sure
mergi
n
g
an early
p
art
o
f a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
A
d
d L
i
nux PPC supp
o
r
t
to the pre-au
t
o-g
c
example h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Va
j
n
a
test-lib: fix color reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
ik
l
os Vajna
I
m
plemen
t
git c
l
one -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup in sha1_file
.
c
:
:
cache_or
_
unpa
c
k_en
t
ry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mikl
o
s
Vajna
b
u
ilt
i
n-commit: use r
e
duce_heads()
o
nly when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-mer
g
e: refresh the index be
f
ore calling a s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
ikl
o
s V
a
jna
t7
6
03: add new
t
e
stcase
s
t
o ensure builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Vajna
bui
l
tin-commi
t
:
us
e
c
om
m
i
t
_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
comm
i
t_
t
r
e
e(): add
a
new auth
o
r
pa
r
ameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Va
j
na
t7501: always use test_
c
mp in
s
tead of
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mikl
o
s Vajna
builtin-merge: release the lockfile in tr
y
_
m
erge_s
t
rat
e
gy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajn
a
merge-recursive: get
r
id
o
f
vi
r
tu
a
l
_
id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive:
move current_{file,directory}_s
e
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos
V
ajna
merg
e
-recur
s
ive:
mo
v
e the global ob
u
f to
st
r
uct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-
r
ecursive:
g
et ri
d
o
f the
i
ndex_
o
nly glo
b
al
v
a
ria
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos V
a
j
na
merge-recursive: move ca
l
l_d
e
pt
h
to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: a
d
d m
e
rge_r
e
cursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mik
l
os
V
ajna
cher
r
y-pick/rever
t
: make direct i
n
tern
a
l
call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-m
e
rge:
a
void run_c
o
m
m
an
d
_v_opt() for
r
ec
u
rsive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
merge-recur
s
i
v
e: int
r
oduce me
r
g
e
_op
t
ion
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klo
s
Vajna
Split
o
ut merge_recursive() to merge
-
recur
s
ive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los Vajna
M
ak
e
file: enable S
N
PRINTF_
R
ET
U
RNS_BOGU
S
f
or
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'g
i
t help
h
elp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
i
klos Vajna
t93
0
0
:
replace
'
!
'
with
test_
m
ust
_
fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docume
n
tation: documen
t
the pager
.
* con
f
i
gurati
o
n
set
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Bui
l
tin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
bu
i
ltin-help: always load_command_list() in
cmd_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s
V
ajn
a
Add a second testca
s
e for handling invalid st
r
ategi
e
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
Add
a new test for using a custom merge s
t
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bui
l
tin-merge: allow using a custom
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
l
os Va
j
na
builtin-help: make some
in
t
erna
l
funct
i
ons available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t7601:
extend
the 'merge picks up the
b
est
resul
t
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mik
l
o
s
V
a
j
n
a
b
u
iltin-merge:
g
ive a prope
r
e
r
ro
r
message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
V
ajna
Teach 'g
i
t
m
e
rge' that some
merge strategies
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajn
a
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 for git-merge-r
e
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
make
re
m
ove-dashes:
apply to scri
p
ts a
n
d progr
a
ms as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s
Vajn
a
git-bisect: use dash-les
s
form on
g
it
b
i
s
e
c
t log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
t1007-hash-object
.
s
h
: use
quote
s
for the
t
est description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: change confu
s
ing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vaj
n
a
Build in
m
erge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next