repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Introduce the diff option '--patience'
2008-12-23
Miklos Vajna
t9129: skip
the last three
test
s
if UTF
-
8 locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
M
iklos
Vajna
S
ubmittingPatc
h
es: ment
i
on
the usage of
r
e
al name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
o
s
Vajna
git
h
oo
k
s
d
ocumentation: add a n
o
te about the
+
x mod
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
V
a
jna
git-daemon docu
m
entation: us
e
{til
d
e
}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Mik
l
os Vajna
git-gui:
Update
Hungarian
translation f
o
r 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
i
klos Vajna
h
ttp
.
c: use 'git_confi
g
_stri
n
g'
to ge
t
'c
u
r
l
_http_pro
x
y'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klo
s
Va
j
na
s
u
bmodule:
u
se git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
rebas
e
:
u
se g
i
t rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
n
a
p
u
ll:
use g
i
t rev-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
los
t
-found: use
git rev-parse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-b
r
anch: use g
i
t rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
gi
t
-stash: u
s
e
g
it rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
Use
r
'
s Ma
n
ual: remove duplicated url at the e
n
d of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos V
a
jn
a
b
uil
t
in_c
l
one:
u
se strbuf in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
builti
n
-clone: use strbuf in clone_loc
a
l
() and cop
y
_or_lin
k
_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajna
builtin-c
l
one:
u
se
s
tr
b
uf in guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos
Vaj
n
a
Add
n
ew testc
a
se to show fast-export
d
oes not al
w
ays
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch: use strbuf in renam
e
_b
r
a
nch(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-
b
r
a
nch: use s
t
rbuf in fill
_
tr
a
cki
n
g_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-
b
ranch: use strbuf in dele
t
e
_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Update Hungari
a
n trans
l
ation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vaj
n
a
git-r
e
mote: document
the m
i
gra
t
ion
f
eature of
the ren
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote renam
e
: mi
g
r
a
te from
r
emotes/ and branche
s
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Va
j
na
remote
:
add
a new
'
o
r
i
g
i
n
'
variab
l
e to the
s
truct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
i
k
los Vaj
n
a
Implemen
t
git re
m
o
te rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos
V
a
jna
u
p
date
-
ref
--no-
d
eref -d: handle the case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
gi
t
b
ran
c
h
-
m
:
f
orbid rena
m
ing of a
symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klos Vajna
F
i
x
gi
t
u
pdate-ref --no-deref
-
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
k
l
os Vajna
rename_ref(): handle the case
when the
r
ef
l
og
o
f a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
j
na
Fi
x
gi
t
b
ranch -m for symre
f
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos
V
ajna
p
a
rse-opt: migrate built
i
n-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add testca
s
e to ensu
r
e merg
i
ng an
e
arly part
o
f a
b
r
a
nch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos
Vaj
n
a
Add Lin
u
x PPC sup
p
ort to the p
r
e-auto-gc example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
Vajna
te
s
t-lib: fix color reset
i
n say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
ik
l
os
V
a
jna
Implem
e
nt git clo
n
e -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
kl
o
s
V
ajna
Cleanup in sha1_file
.
c::cache_or_
u
n
p
a
c
k
_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-c
o
mmit: use reduce_h
e
ads() only when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mikl
o
s Vajn
a
built
i
n-
m
erg
e
: re
f
r
e
sh the in
d
ex
b
efore
callin
g
a
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
a
jna
t
7603: add
new testcase
s
t
o
ensure buil
t
in-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
builtin
-
commit: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
com
m
it_tree(): add a
n
ew
autho
r
p
ara
m
eter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: always u
s
e tes
t
_cmp inst
e
ad of d
i
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
builtin-merge: releas
e
the lockfile in try_merge_strate
g
y()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursi
v
e: get rid of vi
r
tual_i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
merge-recur
s
ive: move cu
r
r
e
n
t_{file,
d
irectory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
n
a
mer
g
e-r
e
cursive:
m
o
ve the global ob
u
f to
s
truc
t
merge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erge-recursive:
g
e
t rid o
f
t
h
e index_only glob
a
l
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
i
klos Vajn
a
merge-recursive: move ca
l
l_depth
to struct me
r
ge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Va
j
na
Makefi
l
e: a
d
d
merge_
r
ecurs
i
ve
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
jn
a
cherry-pi
c
k
/r
e
vert: make direct int
e
rna
l
call to merge
_
tree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
builtin-
m
erge: avoid r
u
n_
c
ommand_v_opt() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
merge-re
c
ursive: introduce merge_opti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
Split out merge_recu
r
sive() t
o
merge
-
recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Ma
k
efile: enabl
e
SNPRINTF_RETURNS_
B
OGUS for
H
P-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vaj
n
a
Fix '
g
i
t he
l
p help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
Vajn
a
t9300: rep
l
ace '!' with
t
est
_
mu
s
t_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos Vajna
Do
c
umentation:
d
ocument the pag
e
r
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklo
s
Vajna
Built
i
n git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajn
a
bui
l
tin-help: always load_com
m
and_list(
)
in cmd_h
e
l
p
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add a second testcase for handlin
g
invalid strateg
i
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajn
a
Add a new test fo
r
us
i
n
g
a
c
ustom merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jn
a
bui
l
tin-
m
e
r
g
e: allow usin
g
a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-help: m
a
ke some internal function
s
available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos
V
a
j
n
a
t7
6
01:
extend the 'merge
p
icks up the
b
e
st res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Mi
k
los Vajna
b
u
iltin-merg
e
:
give a proper er
r
o
r
message for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajn
a
Teach 'git me
r
g
e
' that some merge stra
t
e
g
i
es no lon
g
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vaj
n
a
Add
a
n
e
w test for gi
t
-
m
erge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Vajn
a
t6021: add a
new test for gi
t
-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajn
a
mak
e
r
e
move
-
dashes: ap
p
ly to
s
cripts and programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos
Vajna
g
it-
b
isect: use dash-l
e
ss
form on g
i
t
b
i
sect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os
V
ajna
t1007-hash-object
.
sh:
u
se quotes for the test
descri
p
t
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klo
s
Vajn
a
t0001-init
.
sh: change confusing directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Bu
i
l
d in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajn
a
Fix t760
1
-merge-pull-config
.
sh on AI
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commi
t
-tree: make it usable
f
ro
m
oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos V
a
jna
Add new test
c
ase to ensure git
-
merge prepend
s
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
h
g-to-git: use
g
i
t
i
nit instead of gi
t
init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klo
s
V
aj
n
a
hg-
t
o-
g
it
:
rewrite "git-frotz" to "git fro
t
z"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-to-g
i
t: abort if the project direct
o
ry
i
s not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
hg-to-git: av
o
i
d
rais
i
n
g
a stri
n
g exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
jn
a
INSTALL: Upd
a
te sec
t
io
n
about
g
it-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Re
t
i
r
e
'
stupi
d
' merge strateg
y
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vaj
n
a
A
d
d
n
ew test case to ensure git-merg
e
reduces
o
c
topus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los
V
ajna
A
d
d new
t
e
st t
o
e
nsure git-
m
e
r
ge han
d
les more
th
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Introdu
c
e
get_octopu
s
_merge_b
a
ses() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: mak
e
it usab
l
e from oth
e
r buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
M
o
v
e rea
d
_cache
_
unmerged() t
o
rea
d
-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add new
te
s
t to ensure
git
-
mer
g
e handles pu
l
l
.
t
wohea
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-options's skip_prefix() to git-compat
-
util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move commit_list_
c
ount() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s Vajn
a
Move split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Va
j
na
path-list documentation: document
a
ll
f
unction
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
u
n
-comman
d
documen
t
ation:
fix "mem
s
et
(
)" param
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
git-rea
d
-
t
ree: document -v
option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
k
los Vajna
A
simple
script
t
o parse the result
s
from the testcase
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
gi
t
-rebase -i: m
e
n
tion t
h
e short command a
l
iases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajn
a
R
e
move unu
s
ed code in
p
a
r
se_commit_bu
f
fer
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos
V
ajna
Strbuf docume
n
tat
i
on: do
c
ument
most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision walking
d
ocumentation:
d
o
c
ument most import
a
nt
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s Vajna
CodingG
u
ideli
n
es: Add a note to avoid assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next