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
Add testcase to ensure merging an early part of a branch is done properly
2008-10-14
Miklo
s
Vajna
A
d
d testc
a
se
to ensure mergin
g
a
n
early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
iklos Vajna
test-l
i
b
:
fix color
reset in s
a
y
_
c
olor(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
t7501: a
l
ways use test_cmp instead of d
i
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Mak
e
file:
a
d
d merge_recursive
.
h
to L
I
B_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
klos Vajna
Makefi
l
e: e
n
able S
N
PRINT
F
_RETURNS_BOGUS for
H
P-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
t930
0
: rep
l
ace '!' with test_
m
u
st_fa
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklo
s
V
a
j
na
Documentatio
n
:
d
ocument t
h
e
pager
.
* configu
r
ation set
t
ing
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vaj
n
a
t7601: extend
the 'me
r
ge picks up the best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-m
e
r
ge: give a proper
error
m
essage for
i
n
v
al
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos V
a
jn
a
Tea
c
h 'git merge' that so
m
e mer
g
e str
a
t
e
g
i
es n
o
l
ong
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
A
d
d a new test for git
-
merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021:
a
dd
a
new test for git-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
make remove-dashes: ap
p
ly to scripts
a
nd programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
g
i
t-bisect:
u
s
e dash-le
s
s for
m
o
n
g
i
t
bi
s
e
ct l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007
-
hash-object
.
sh:
u
se qu
o
tes f
o
r
t
he test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
los Vajna
t
0001-init
.
s
h: chan
g
e confu
s
ing directo
r
y n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajn
a
B
uild in
m
erge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
Fix t7601-m
e
r
ge-pul
l
-conf
i
g
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
git-comm
i
t
-tree: make it usable
f
rom othe
r
builtin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajna
Add new
t
e
s
t
case to ensure git-m
e
r
g
e prepends t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los Vajna
hg-to-git: us
e
git init
instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: rewri
t
e "git-frotz"
to "git
f
r
otz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
it:
abort if the
p
ro
j
e
c
t direct
o
ry is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git: avoid
r
a
isi
n
g
a
s
t
ring exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
I
N
STA
L
L: Update section abou
t
git-frotz fo
r
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Retire '
s
tupid'
m
erge
s
t
rategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new t
e
st case to e
n
sure git-me
r
ge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos V
a
j
n
a
Add
new test to ensure git-merge
handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
Introduce get_o
c
topus_merge_
b
ases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Va
j
na
g
i
t-fmt
-
merge-m
s
g:
m
ake it usable from
o
ther builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
rea
d
_ca
c
he_unmerged() to rea
d
-cac
h
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Add ne
w
test to en
s
ure git-merge
han
d
les
p
ull
.
t
wohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move parse-options
'
s skip_prefix() to git-com
p
at-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Mo
v
e
c
o
mmi
t
_list_cou
n
t
(
)
to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
Va
j
na
M
ove s
p
lit_cm
d
lin
e
() to
a
lias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vajna
path-list documentation: documen
t
all function
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
o
s
Vajna
run-command documentation: fix "m
e
mset()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
g
it-
r
ead-tr
e
e: do
c
ument -v op
t
ion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple scr
i
pt t
o
parse the resul
t
s
f
rom the t
e
s
t
cases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
git
-
rebase -i: me
n
t
i
on the
s
hort
c
ommand ali
a
ses
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
Remove u
n
use
d
code in parse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vajna
Strbuf
d
ocumentatio
n
: doc
u
ment
most functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s Vajn
a
Revision walking
documentation
:
document
m
o
s
t
importa
n
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
CodingGuideli
n
es: Ad
d
a no
t
e
t
o
avoid assignmen
t
s ins
i
de
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merge
:
e
xc
l
ude unnecess
a
ry
options fro
m
OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
iklo
s
V
a
jn
a
git-fa
s
t
-import:
r
ename cmd_
*
() functions to
parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTA
L
L: add
a
note abou
t
GNU interactiv
e
tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
A
d
d tests for sendemail
.
c
c
config
u
rati
o
n
v
ariable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajn
a
git-send-email
:
add a new
sendemail
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
git-format-p
a
tch: add a new format
.
cc c
o
nfigura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checkout: add -t ali
a
s fo
r
--tra
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff
o
ptions doc
u
mentation:
r
efer to --d
i
ff-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
con
t
rib/hooks: add an
example pre-auto-gc
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
Documentati
o
n/hooks
:
add pr
e
-au
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
git-gc
--auto: add pre-
a
uto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mi
k
los Vaj
n
a
D
o
cument
a
tion/git-mer
g
e: documen
t
su
b
tree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui: Updated Hungari
a
n translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Up
d
at
e
H
u
n
g
arian t
r
anslat
i
on
.
100%
c
ompleted
.
commit
|
commitdiff
|
tree
2008-02-29
Mikl
o
s Va
j
na
Improve t6029 to
check t
h
e real "subtree" cas
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
i
kl
o
s Vajna
Documentation/gi
t
svn
l
og: add
a
n
o
t
e abo
u
t timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
Vaj
n
a
Documentatio
n
/
git-filter-branch: add a new ms
g
-fi
l
te
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean:
handle error
s
if
removi
n
g files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mikl
o
s Vajna
Doc
u
mentation/git-
s
tash: documen
t
options fo
r
g
i
t s
t
ash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos V
a
jna
g
i
t clon
e
-s documentation:
for
c
e a new pa
r
a
graph f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
i
k
los
Vajna
b
uiltin-gc
.
c: guard conf
i
g parser from va
l
u
e
=N
U
LL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
M
ik
l
os
Va
j
na
g
i
t rev-parse manpage: spelling f
i
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
aj
n
a
git pull manpage
:
don't include -n fro
m
f
e
tch-opt
i
on
s
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
i
klos Vajna
gi
t
-
c
lone -s: document problems
with
g
i
t gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klos Vajna
Incl
u
de rev-list optio
n
s
i
n git-
l
og
m
anpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
os Vajn
a
ls-remote:
a
dd -t and -h
o
ptions
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
Ad
d
using merge
subtree How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mik
l
os Vajna
t/t7001: avoid unnecessary ERE when using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mikl
o
s Vajn
a
git-sh-setup: doc
u
ment git_edito
r
(
) and ge
t
_autho
r
_id
e
n
t_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos
V
ajna
e
veryda
y
:
replace 'prune'
a
nd '
r
e
pack'
with 'g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Upd
a
t
e
Hunga
r
ian trans
l
a
t
ion
.
100%
completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
In
c
lude diff opti
o
n
s
i
n th
e
git-log manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
M
iklos Va
j
na
git-sen
d
-email
:
add a new sendema
i
l
.
to configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Mik
l
os
V
ajna
git stash: document appl
y
'
s
--index swit
c
h
commit
|
commitdiff
|
tree
2007-09-29
Miklos Vajna
git-bundle: fix co
m
mandline examples
in the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
V
a
j
na
User Man
u
al: add a
c
h
a
p
ter
f
o
r submodul
e
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Miklo
s
Vajna
Hungarian
t
ranslatio
n
of git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Miklos Vajna
g
itweb:
new cgi p
a
ra
m
eter
:
opt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: p
r
ef
e
r g
i
t_get_p
r
oject_own
e
r() ov
e
r g
e
t_fil
e
_owner
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mik
l
os
Vajna
D
o
cument -<n> for git-forma
t
-patch
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree