repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2008-07-20
Mi
k
los
V
a
j
na
Teach 'git merge' that some merg
e
strategies n
o
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
na
Add a new t
e
st f
o
r
g
i
t-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
ik
l
o
s Va
j
na
t
60
2
1: add a new
t
e
st for
g
it-merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
make remove-dashes: a
p
ply to scripts and prog
r
ams a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
l
os Vajna
git-bisect: use dash-less
f
orm on git bisect l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t1007
-
hash-objec
t
.
sh:
use quotes for the
t
est description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
los
Vajna
t0001
-
init
.
sh
:
change con
f
using direc
t
ory
n
a
m
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mikl
o
s Vajna
Build in me
r
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix
t
7
6
01-merge-pull-c
o
nfig
.
sh
o
n AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
g
i
t-commit-t
r
ee: make
i
t usa
b
le
f
rom ot
h
e
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
los Vajna
Ad
d
new test case t
o
en
s
u
r
e
g
it-merge prepe
n
ds
the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: use git init
i
n
st
e
ad
of g
i
t init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: r
e
write "
g
it-frotz"
to "
g
it frotz
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git
:
a
b
ort
i
f
t
h
e project directory 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
aising a string exceptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
I
N
S
TAL
L
:
U
pdate secti
o
n about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklos
V
a
j
na
Retire 'stupid' m
e
r
g
e strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d ne
w
t
e
st
case
t
o ensure gi
t
-merge r
e
duc
e
s octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Add new test
to
e
n
sure gi
t
-merge handles mo
r
e
t
han
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
jna
Introduc
e
g
e
t
_
o
ctopu
s
_
m
e
rge
_
bases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
o
s Vajna
git-fmt-merg
e
-msg: make it usa
b
le
f
ro
m
other built
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
read_
c
a
che_unmerged() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test to ensu
r
e gi
t
-merge handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
Vajna
Move parse-
o
ption
s
's
skip_prefix() to git-
c
omp
a
t-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
commit_l
i
st_cou
n
t
() to co
m
mit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
v
e
split_cmdl
i
ne() to ali
a
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajna
p
ath-list
documentation: doc
u
ment all
f
unctio
n
s and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-
c
ommand do
c
umentat
i
on: fix "memset
(
)" par
a
meter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tre
e
: docume
n
t -v o
p
tion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
A si
m
pl
e
script to
parse the r
e
sults from t
h
e t
e
stcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
git-rebase -i:
m
ention the short command aliases
i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remov
e
unuse
d
co
d
e in parse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf documen
t
a
t
io
n
: docu
m
e
n
t most
f
unctions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos V
a
jna
Revision wa
l
king document
a
t
ion
:
document most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos Vajna
CodingGuidel
i
nes: A
d
d
a note to av
o
id assignments
i
nside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklo
s
Vajna
git-merge: exclude unnece
s
s
a
r
y
options from OPTIONS_
S
PEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mik
l
os Va
j
na
git
-
fa
s
t-import
:
rename cmd_*()
f
u
n
c
t
i
ons
t
o parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Mik
l
os Vajna
I
NST
A
LL: add
a
note
a
bout GNU int
e
ractiv
e
tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add te
s
ts f
o
r sendemail
.
c
c
c
o
nfigu
r
ation variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
git-sen
d
-email: add a
n
ew sendem
a
i
l
.
cc
c
onfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
l
o
s V
a
jna
g
i
t-fo
r
mat-patch
:
a
d
d a
n
ew format
.
c
c
con
f
igura
t
ion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mi
k
los Vajna
g
i
t
checkout: ad
d
-t alias for --t
r
ack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Va
j
n
a
diff options
d
ocum
e
ntat
i
on:
r
efer to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
contr
i
b/hooks: add an example pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
V
ajna
D
o
c
umentation/hooks: add
p
re-
a
u
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-auto-
g
c ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Mik
l
os Vaj
n
a
Documentation
/
git-m
e
r
g
e: docume
n
t subt
r
ee strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Vajna
git-gu
i
:
U
pda
t
ed
H
ung
a
rian translation
(
e5fba
1
8)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Upda
t
e H
u
nga
r
ian transl
a
tion
.
100% complet
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t6029 to chec
k
the re
a
l
"subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Doc
u
me
n
tat
i
on/git svn
log: add
a
note about timez
o
nes
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
Vaj
n
a
Documentation/g
i
t-filter-bran
c
h: add a new msg
-
filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: handle
e
r
r
ors if removing files fa
i
ls
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mi
k
los Vajna
Documentation/git-stash: documen
t
o
p
tions for git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos Vajna
git clone -s documenta
t
i
o
n: force a new paragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Va
j
n
a
builtin-gc
.
c
:
guar
d
config parser from value=N
U
LL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev
-
p
a
rse manpage:
s
pelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
g
it pull manpage:
d
o
n'
t
includ
e
-n from fet
c
h-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklo
s
Vajna
git-clone -s: docu
m
ent problems wi
t
h git
g
c --p
r
une
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Includ
e
r
e
v-list optio
n
s in
git-log
manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
l
s-remote: add -
t
and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mikl
o
s Vajna
Add
u
si
n
g merge subtree
How-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mik
l
os Vajna
t/t7
0
01: avoi
d
unnecessary
ERE when
using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
los Vajna
git-s
h
-setup: docum
e
n
t
git_editor() and get_autho
r
_ident_f
r
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
M
iklos Vajna
everyday:
replace 'prune
'
and
'repack'
with
'
gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mi
k
l
o
s Vajna
U
p
date Hungarian
tran
s
lation
.
1
0
0%
c
om
p
l
eted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include d
i
ff
o
pt
i
ons i
n
the git-l
o
g manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-send-
e
mail: add
a
n
ew sendemail
.
t
o
config
u
ration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
V
ajna
git st
a
sh: document a
p
ply's
--index s
w
itch
commit
|
commitdiff
|
tree
2007-09-29
Mikl
o
s
V
aj
n
a
gi
t
-bundle: fix com
m
andline examples in th
e
ma
n
p
age
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
V
ajna
User Manual: add a chapt
e
r for submodules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mik
l
os Vajna
Hungarian tra
n
slation
o
f gi
t
-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-12
Mik
l
os Va
j
na
g
itweb: new cg
i
p
a
rameter:
o
pt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-07
Miklos Vajna
gitweb: prefer git_get_project_o
w
ner(
)
ov
e
r get_file_owne
r
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-07-04
Mi
k
los
V
a
jna
D
o
cument -<n> for
g
it-f
o
r
m
a
t
-
pat
c
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree