repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge script: handle --no-ff --no-commit correctly
2010-08-18
Jonathan
Nieder
merge script: handle
-
-
n
o-ff -
-
no-commit cor
r
ectly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
merge script: --ff-only to
disallow true
m
e
rge
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nied
e
r
mer
g
e scrip
t
: handle many-way octopus
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merge
s
cript: handle -m
-
-log correctly
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
merge
script:
f
orbid
merge -s index
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
merg
e
script
:
allow cus
t
o
m strate
g
ies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonatha
n
Nieder
merge scrip
t
: merg
e
-X<option>
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge script: improve log
m
e
s
sage subject
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge
script: refus
e
to merge durin
g
m
e
rg
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an N
i
e
der
merge script: tweak unme
r
ged files messa
g
e to
match
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
on
a
than Nieder
merge
script: --squash,
--ff
from
unborn b
r
an
c
h are
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
fmt-merge-msg -m
to override merge ti
t
le
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
Nieder
merge-base --i
n
de
p
e
nden
t
to print red
u
c
e
d parent list
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
merge-b
a
se --
o
ctopus to
m
imic show-branc
h
--merge-ba
s
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Niede
r
Document
a
tion: add a
S
E
E
A
LSO section for merge-base
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t6200 (fmt-mer
g
e-msg): styl
e
ni
t
p
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
t6010 (merge-bas
e
)
: modernize styl
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7600 (merg
e
): test merge f
r
om bran
c
h y
e
t
t
o be b
o
rn
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
ona
t
h
a
n Nieder
t
7600 (merge): c
h
eck reflo
g
e
n
t
ry
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t7
6
00 (merge): do
n
ot l
a
u
nch git
k
for --deb
u
g
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan Nieder
t7600 (merge): modernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
ieder
me
r
ge: do not
mistake (ancestor of
)
tag
f
or branc
h
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nie
d
er
t
/README: correct a
n
exception when break
i
ng a &&
c
h
ain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
N
ieder
Ad
d
a
sample user for
t
he svndump
library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Doc
u
me
n
tation: add submodule
.
*
to the big
configuration
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
Nieder
gitmodules
.
5
:
url can be a relat
i
ve path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
tha
n
Niede
r
git -
-
paginate: pag
i
nate exter
n
al commands a
g
ai
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
Jona
t
han Nied
e
r
t
3000 (ls-fi
l
es -o):
m
odernize st
y
l
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan
N
ie
d
er
t9118 (g
i
t-svn): preve
n
t early failure f
r
om taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
than
Nieder
t/REA
D
ME: d
o
cument more test h
e
lper
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jo
n
athan Nieder
r
evert: do
no
t
rebui
l
d a
r
gv on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
ona
t
h
a
n N
i
eder
t
e
sts: local con
f
ig fil
e
shou
l
d be honored from subd
i
rs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
o
nat
h
an
N
ieder
t70
0
6: test pager con
f
iguration for several
git co
m
mands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t70
0
6 (
p
a
g
e
r):
i
ntrodu
c
e helper
for par
a
meter
i
z
e
d tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jonath
a
n N
i
eder
t35
0
8 (ch
e
rry-
p
ick):
f
u
t
urepr
o
of against un
m
e
rged files
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jona
t
han Nieder
g
i
t-svn:
s
trip
o
ff leading slash
e
s
on -
-
trunk
a
rgumen
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Ni
e
d
e
r
add-intera
c
tive: Clar
i
fy “remaining hunks in the
file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
gre
p
: refact
o
r grep_o
b
jects loo
p
int
o
its own function
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jo
n
a
t
han Nieder
Documentation/checkou
t
: cl
a
rify
d
escription
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nieder
r
ebase
-i -p: docu
m
e
nt shortc
o
mings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan
N
ieder
D
W
IM 'git sho
w
-5' to 'git show --do-w
a
l
k -5
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan N
i
eder
git
i
gn
o
r
e
.
5:
C
larify matching rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
re
b
a
se: improve error me
s
s
age when upst
r
eam ar
g
ument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonat
h
an Nieder
Documentation/checkout: clarify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonatha
n
Nieder
fsc
k
:
fi
x
bogu
s
co
m
mit h
e
ader
check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
J
ona
t
ha
n
Nieder
Add
git remote set-branches
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
N
ieder
post-re
c
eive-email: d
o
c
u
ment c
o
m
m
and-line mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
g
i
t
svn: avoid u
n
init
i
alized var in 'r
e
set'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
Mak
e
fi
l
e: let he
a
der
dependency check
e
r override COMPUTE_HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Mak
e
file: fix hea
d
er d
e
pendency checke
r
to allow NO
_
CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ied
e
r
Docu
m
entation/
n
otes: nitp
i
cks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Docu
m
ent
a
tion/
n
otes: clean up description of rewriti
n
g
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jo
n
a
t
han
Nieder
Document
a
t
i
on/notes: simplify treatment of
d
efaul
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onath
a
n Nieder
Docu
m
entation/log: ad
d
a
CONFIGURA
T
ION se
c
t
ion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes: simplify treatment
o
f defa
u
l
t
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
D
o
c
u
m
entation/not
e
s: add confi
g
uration se
c
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan N
i
eder
Documentation/n
o
tes:
d
escribe c
o
ntent of n
o
tes blobs
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
athan Nie
d
er
Documentation/notes
:
docume
n
t forma
t
of notes
trees
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan
Nieder
ch
e
rry-pick: do not
d
ump core when i
c
onv fails
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonat
h
an Nieder
pretty: i
n
itialize new
c
mt_fmt_map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
o
nathan Nieder
adapt request-pull te
s
ts for new p
u
ll request format
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
tes
t
-lib:
s
ome
shel
l
s do not le
t
$? pr
o
pagat
e
into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
sh
o
rtlog: Document and
t
est --
f
ormat o
p
ti
o
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t4201 (
s
hortlog): Te
s
t output format with
m
ultipl
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Ni
e
d
e
r
t420
1
(shortlog
)
:
guard setup wit
h
test_expect_succes
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Documentatio
n
/shortlog: scripted users
should not
r
ely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
J
on
a
than Nieder
commit --amend
:
cope with m
i
s
sing disp
l
ay
n
ame
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
test-lib: Let te
s
ts specify c
o
mmands to be
run at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
fsck: check i
d
e
n
t lines
i
n com
m
i
t objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jon
a
than Nieder
r
e
qu
e
st-pull: pr
o
tect against OPTION
S
_KEEPDASHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jo
n
ath
a
n Nieder
tests for request-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
J
o
n
athan Ni
e
der
Documen
t
a
t
ion/Makefile:
fix i
n
terrupted builds of user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix
"bundle --st
d
in" se
g
fault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t5704 (bundle): add
tests for bundle --stdin
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jon
a
than
N
ieder
tag -
v
: use RUN_GIT_CMD to run
verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
N
ieder
Docu
m
en
t
new "already-merged" rule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nath
a
n
N
ieder
Add
.
dep
e
nd
directories to
.
g
i
tignore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
de
r
t7006: guard cleanup
w
ith
test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nieder
t5800: test
g
it h
e
lp
e
r requ
i
res Python support
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jo
n
at
h
an
N
ieder
t7400: clarify
s
ubmodule update
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t
7
400: clarify 'submodule add' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
J
onathan Nieder
t
7400: s
p
l
it set
u
p into mul
t
ip
l
e tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan
N
ieder
Teach mailinfo %
<
as an a
l
ternati
v
e scissors mark
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makef
i
le: future
-
proof Cygwin version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-
r
ecursive: add
a label for anc
e
s
t
o
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
d
er
cherry-pick,
revert: add a labe
l
for a
n
ce
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
revert: cla
r
ify lab
e
l on
conflict hunks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ie
d
er
co
m
pat: add
mempcpy()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
checkou
t
-m --conflict=diff3: a
d
d a la
b
el
f
or ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
merge_trees(): add ancestor
l
abel parameter for di
f
f3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Niede
r
m
e
rg
e
_fi
l
e(): add comment expla
i
ning be
h
avior
w
r
t co
n
flict
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout --
c
o
n
fl
i
ct=diff3: add a l
a
b
el for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than N
i
eder
ll
_
m
e
r
ge(): add
a
ncestor label
parameter f
o
r diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-file
--diff3:
a
dd a label for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): m
o
ve file1 and file2 labels to xm
p
aram
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xd
l
_
m
erg
e
(): add optional a
n
cestor l
a
bel
t
o diff3-styl
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
tests: docu
m
ent cherry-pic
k
be
h
avior in f
a
ce
of conflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
er
tes
t
s: document
f
ormat
o
f confl
i
c
t
s from checko
u
t -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nie
d
er
revert:
fix tiny memory
l
e
a
k
in cherry-pick --ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
Nieder
Makefile: Fix oc
c
asion
a
l GIT-CF
L
AGS breakage
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next