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-c
o
mmit
c
orrectl
y
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
atha
n
Nied
e
r
m
e
r
g
e script: --ff-only to disall
o
w true merge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
than Nieder
merge s
c
r
i
pt: handle many-way
octopus
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
merge scr
i
pt: handle -m
-
-
l
og
c
or
r
ectly
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
mer
g
e scr
i
pt:
forbid merge
-
s ind
e
x
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
natha
n
Nieder
me
r
ge script:
allow custom stra
t
e
g
ies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
me
r
g
e
script: merge -X<o
p
tion>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nied
e
r
mer
g
e
s
cript: im
p
rove log
m
essa
g
e
subjec
t
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan
N
iede
r
merge script:
refuse
t
o merge during
me
r
ge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nat
h
a
n N
i
e
der
m
e
rge
scrip
t
: tweak unmerged
f
iles messa
g
e to ma
t
ch
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jo
n
a
than Nieder
m
e
rge
s
cript: --
s
quash, --ff from
u
n
born branch
a
re
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nie
d
er
fmt-merge-
m
sg
-
m to override me
r
ge title
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
m
e
rge-base --
i
ndependent to
pr
i
n
t
reduced p
a
rent l
i
st
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han Nieder
me
r
ge-base
-
-octopus to mi
m
ic show-
b
ranc
h
--merge-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jona
t
han
Nieder
Documentation: add a SEE ALSO
section for merge-base
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Nieder
t620
0
(fm
t
-m
e
rge-msg
)
: style ni
t
picks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan N
i
e
der
t60
1
0 (merge-ba
s
e): mode
r
nize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonath
a
n Nieder
t7600
(
merge): test merge
f
r
om branch yet to
be born
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonat
h
an Nieder
t7600 (merge): c
h
ec
k
r
e
f
l
og
e
ntry
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jonathan Niede
r
t7600 (merge
)
:
d
o
not la
u
nch gitk for --
d
ebug
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
Jon
a
tha
n
Nieder
t7600
(
merge): mo
d
erni
z
e style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-18
J
o
nathan N
i
ede
r
merge
:
do not mistake (ancestor
o
f)
t
ag
for branch
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jo
n
athan
N
ieder
t/READ
M
E: correct
a
n exception when breaking a && chai
n
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Ad
d
a sample user for the svnd
u
mp lib
r
ary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan Niede
r
Documentation: add submodule
.
* to the big c
o
nfigu
r
ation
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-15
J
ona
t
han Nied
e
r
gitmodules
.
5:
u
rl
c
an be a relative path
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Ni
e
d
er
git --paginate: paginate exter
n
al comma
n
d
s
a
g
ain
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-12
Jonathan
N
i
eder
t
3
000 (ls-files -o): mod
e
r
n
ize sty
l
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan
Nie
d
er
t
9
118 (git-svn
)
: prevent early f
a
ilure from t
a
k
i
ng
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-07-07
Jon
a
than Nieder
t/
R
EADME: document more te
s
t
helpers
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-29
Jon
a
t
h
an Nied
e
r
revert: do not rebuild argv
on heap
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
N
ieder
tests:
local config file should be honored from sub
d
i
r
s
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jo
n
athan Nie
d
er
t7006: test pager
c
o
n
figuration
f
o
r several g
i
t commands
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan
Nieder
t7
0
06
(pager)
:
i
ntroduce
he
l
per
f
or pa
r
amet
e
rized t
e
s
t
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan Nieder
t35
0
8 (cherry-pick
)
:
futureproo
f
against
u
n
m
erged fil
e
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jo
n
at
h
an
N
ieder
gi
t
-sv
n
:
strip off
l
ea
d
ing slashes on
--trunk ar
g
ument
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan Nieder
add-
i
nteractive:
Clarify “r
e
maining hunks in the file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
N
ieder
grep: r
e
factor grep_objects loop into its o
w
n fun
c
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
than Nie
d
er
Documentatio
n
/checkout: cl
a
rif
y
description
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
Jonathan Nied
e
r
rebase -i -
p
: document shortc
o
mings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
Jona
t
han Nieder
DWI
M
'git show
-5' to 'g
i
t show --d
o
-walk -5'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan N
i
eder
gitignore
.
5: Clarify matching rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
r
e
base: i
m
prove error m
e
s
s
age
when upstream argum
e
n
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jon
a
than Nieder
Doc
u
ment
a
tion/checkou
t
: cl
a
rify descriptio
n
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
J
o
nathan Ni
e
d
er
fsck: fix bogus
c
ommit hea
d
er
check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
J
onathan Nieder
Add gi
t
r
e
mote se
t
-
b
ranches
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan Nieder
post-recei
v
e-email: documen
t
comman
d
-l
i
ne
m
ode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonath
a
n Nied
e
r
git svn: avoid uninitial
i
zed var in 'r
e
set'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
than N
i
eder
Makefi
l
e: l
e
t
h
eade
r
d
e
pendency checker
o
verride COMP
U
T
E
_HEA
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nieder
Makef
i
le:
fix header de
p
e
ndenc
y
checker t
o
a
llo
w
NO_
C
U
R
L
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes
:
nit
p
icks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonatha
n
Ni
e
der
Docum
e
ntat
i
on/notes: clean up
descri
p
tion of rew
r
iting
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
an
Nieder
Documentati
o
n/n
o
tes
:
simplify treatment of defau
l
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nie
d
er
D
ocumentation
/
log: add a CON
F
IGURATION section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
ona
t
han Niede
r
Documentation/
n
otes: simplify treatmen
t
o
f
default
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan
N
ieder
Documen
t
ation/notes: add confi
g
urat
i
o
n section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han
N
ieder
Documentation
/
not
e
s: descri
b
e
cont
e
nt of notes
b
lobs
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
han Nied
e
r
Document
a
tion/n
o
tes: document
format o
f
notes trees
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
Ni
e
der
cherry-pick:
do not dump
c
o
re
w
hen iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan
N
ieder
pretty: initialize
n
ew cmt
_
fmt_map to 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
than Nieder
ada
p
t request
-
pull
t
ests fo
r
new
pull
r
e
ques
t
format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jona
t
ha
n
Nied
e
r
test-lib: some shells do not let $? propagate
into
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Nieder
shor
t
l
o
g: D
o
cument and test --
f
o
r
mat
option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
tha
n
Nieder
t4201 (shortlog)
:
Test
output f
o
rmat w
i
th multiple
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Nieder
t4201 (s
h
ortlog):
g
uard setup with
t
e
st_expect_success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Ni
e
der
Documentation/s
h
o
r
tlog: scr
i
pted
users should not rely
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan Nieder
c
o
mmit --amend: cope with missing d
i
splay name
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t
e
st-
l
i
b:
L
et tests speci
f
y command
s
to be run at end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
J
o
nathan
N
iede
r
fsck:
c
heck ident lines in commit
o
bjects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jona
t
han Nieder
reques
t
-pull: protect agai
n
st OPTIONS_KEEPDASHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan
Nieder
tests for
r
equest-pull
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan N
i
eder
Documentation/M
a
kefile: fix interrupt
e
d build
s
of user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonat
h
a
n
Nieder
fi
x
"
bundle --stdin" segfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t570
4
(bundle):
add
t
es
t
s for
b
un
d
le
-
-stdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonatha
n
Nieder
t
a
g -
v
:
u
s
e
RUN_GIT_CMD to run veri
f
y-t
a
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jona
t
h
an Nie
d
er
Document new "a
l
r
e
ady-merged" rule f
o
r
b
ranch -d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jon
a
tha
n
N
i
eder
Add
.
de
p
end directories to
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
onathan Nieder
t7006: guard
c
le
a
n
u
p wit
h
t
e
st_
e
xpe
c
t
_
success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan Nieder
t5800
:
testgit helper
r
e
quires Python su
p
p
ort
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jo
n
athan Nieder
t74
0
0: clarify submo
d
ule update tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
J
onathan Nieder
t7400: clari
f
y 'submodule add' tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nieder
t7400: sp
l
it setup into
m
u
ltiple t
e
sts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nie
d
er
Tea
c
h mailinfo %
<
as an alternative sciss
o
rs mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan N
i
eder
Makefil
e
:
f
u
ture-
p
r
oof Cygwi
n
v
ersi
o
n
check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
me
r
ge
-
re
c
ursive:
add a
l
a
b
e
l f
o
r ances
t
or
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nie
d
er
cherry-pick,
revert: add a l
a
bel
f
or ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nied
e
r
revert:
clarify label on conflic
t
hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: add mempc
p
y()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
c
h
eckout -m -
-
conflict=diff3: add a lab
e
l for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_
t
rees():
a
d
d ancestor label paramete
r
for dif
f
3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
merge_
f
ile(): add
c
o
m
m
ent explain
i
n
g b
e
havior wrt
conflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
check
o
ut --
c
onflict=diff
3
:
add a label for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
ll_merge(): add ancesto
r
label
p
a
r
a
m
e
ter
f
o
r
diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
mer
g
e
-file --diff3:
a
dd a label for ance
s
tor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
than Niede
r
xdl_merge(): move file1
and file
2
lab
e
ls to
xmpa
r
am
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge():
a
dd optio
n
al ancestor label to dif
f
3-s
t
yle
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
h
a
n Nieder
tests: do
c
ument cherr
y
-pick behavior in
face of co
n
f
l
icts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
de
r
tests: docum
e
nt for
m
at
o
f con
f
licts from checkout -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
than Nieder
r
e
v
e
r
t
:
f
ix
t
iny
m
e
mory lea
k
in cherr
y
-pick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
Nieder
Makefile: Fix o
c
casional GIT-
C
FLAGS breakage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next