?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
merge script: merge -X<option>
2010-08-18 Jonathan Niedermerge script: merge -X<option>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: improve log message subject
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: refuse to merge during merge
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: tweak unmerged files message to match...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: --squash, --ff from unborn branch are...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niederfmt-merge-msg -m to override merge title
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge-base --independent to print reduced parent list...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge-base --octopus to mimic show-branch --merge-base
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan NiederDocumentation: add a SEE ALSO section for merge-base
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedert6200 (fmt-merge-msg): style nitpicks
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedert6010 (merge-base): modernize style
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedert7600 (merge): test merge from branch yet to be born
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedert7600 (merge): check reflog entry
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedert7600 (merge): do not launch gitk for --debug
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedert7600 (merge): modernize style
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge: do not mistake (ancestor of) tag for branch
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-07-21 Jonathan Niedert/README: correct an exception when breaking a && chain...
commit | commitdiff | tree
2010-07-16 Jonathan NiederAdd a sample user for the svndump library
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-07-15 Jonathan NiederDocumentation: add submodule.* to the big configuration...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-07-15 Jonathan Niedergitmodules.5: url can be a relative path
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-07-14 Jonathan Niedergit --paginate: paginate external commands again
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-07-12 Jonathan Niedert3000 (ls-files -o): modernize style
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-07-08 Jonathan Niedert9118 (git-svn): prevent early failure from taking...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-07-07 Jonathan Niedert/README: document more test helpers
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-29 Jonathan Niederrevert: do not rebuild argv on heap
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-28 Jonathan Niedertests: local config file should be honored from subdirs...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-28 Jonathan Niedert7006: test pager configuration for several git commands
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-28 Jonathan Niedert7006 (pager): introduce helper for parameterized tests
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-14 Jonathan Niedert3508 (cherry-pick): futureproof against unmerged files
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-14 Jonathan Niedergit-svn: strip off leading slashes on --trunk argument
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-13 Jonathan Niederadd-interactive: Clarify “remaining hunks in the file”
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-13 Jonathan Niedergrep: refactor grep_objects loop into its own function
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-11 Jonathan NiederDocumentation/checkout: clarify description
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-11 Jonathan Niederrebase -i -p: document shortcomings
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-02 Jonathan NiederDWIM 'git show -5' to 'git show --do-walk -5'
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-01 Jonathan Niedergitignore.5: Clarify matching rules
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-01 Jonathan Niederrebase: improve error message when upstream argument...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-06-01 Jonathan NiederDocumentation/checkout: clarify description
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-28 Jonathan Niederfsck: fix bogus commit header check
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-20 Jonathan NiederAdd git remote set-branches
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-20 Jonathan Niederpost-receive-email: document command-line mode
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan Niedergit svn: avoid uninitialized var in 'reset'
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederMakefile: let header dependency checker override COMPUTE_HEA...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederMakefile: fix header dependency checker to allow NO_CURL...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederDocumentation/notes: nitpicks
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederDocumentation/notes: clean up description of rewriting...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederDocumentation/notes: simplify treatment of default...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederDocumentation/log: add a CONFIGURATION section
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederDocumentation/notes: simplify treatment of default...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederDocumentation/notes: add configuration section
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederDocumentation/notes: describe content of notes blobs
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-09 Jonathan NiederDocumentation/notes: document format of notes trees
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-08 Jonathan Niedercherry-pick: do not dump core when iconv fails
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-08 Jonathan Niederpretty: initialize new cmt_fmt_map to 0
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-08 Jonathan Niederadapt request-pull tests for new pull request format
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-06 Jonathan Niedertest-lib: some shells do not let $? propagate into...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-04 Jonathan Niedershortlog: Document and test --format option
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-04 Jonathan Niedert4201 (shortlog): Test output format with multiple...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-04 Jonathan Niedert4201 (shortlog): guard setup with test_expect_success
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-04 Jonathan NiederDocumentation/shortlog: scripted users should not rely...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-04 Jonathan Niedercommit --amend: cope with missing display name
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-04 Jonathan Niedertest-lib: Let tests specify commands to be run at end...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-01 Jonathan Niederfsck: check ident lines in commit objects
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-01 Jonathan Niederrequest-pull: protect against OPTIONS_KEEPDASHDASH...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-05-01 Jonathan Niedertests for request-pull
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-22 Jonathan NiederDocumentation/Makefile: fix interrupted builds of user...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-20 Jonathan Niederfix "bundle --stdin" segfault
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-20 Jonathan Niedert5704 (bundle): add tests for bundle --stdin
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-17 Jonathan Niedertag -v: use RUN_GIT_CMD to run verify-tag
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-15 Jonathan NiederDocument new "already-merged" rule for branch -d
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-15 Jonathan NiederAdd .depend directories to .gitignore
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-15 Jonathan Niedert7006: guard cleanup with test_expect_success
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-13 Jonathan Niedert5800: testgit helper requires Python support
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-11 Jonathan Niedert7400: clarify submodule update tests
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-11 Jonathan Niedert7400: clarify 'submodule add' tests
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-11 Jonathan Niedert7400: split setup into multiple tests
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-04 Jonathan NiederTeach mailinfo %< as an alternative scissors mark
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-04-03 Jonathan NiederMakefile: future-proof Cygwin version check
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedermerge-recursive: add a label for ancestor
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedercherry-pick, revert: add a label for ancestor
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niederrevert: clarify label on conflict hunks
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedercompat: add mempcpy()
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedercheckout -m --conflict=diff3: add a label for ancestor
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedermerge_trees(): add ancestor label parameter for diff3...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedermerge_file(): add comment explaining behavior wrt conflict...
Signed-off-by: Jonathan Nieder <jrnieder@mgila.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedercheckout --conflict=diff3: add a label for ancestor
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niederll_merge(): add ancestor label parameter for diff3...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedermerge-file --diff3: add a label for ancestor
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niederxdl_merge(): move file1 and file2 labels to xmparam...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niederxdl_merge(): add optional ancestor label to diff3-style...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedertests: document cherry-pick behavior in face of conflicts
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niedertests: document format of conflicts from checkout -m
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-21 Jonathan Niederrevert: fix tiny memory leak in cherry-pick --ff
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-20 Jonathan NiederMakefile: Fix occasional GIT-CFLAGS breakage
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-20 Jonathan NiederMakefile: Fix CDPATH problem
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-20 Jonathan Niedergitk: Don't clobber "Remember this view" setting
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-03-20 Jonathan Niedergitk: Add comments to explain encode_view_opts and...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-02-28 Jonathan NiederMakefile: clarify definition of TEST_OBJS
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-02-23 Jonathan Niederam: remove rebase-apply directory before gc
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-02-22 Jonathan Niedertests: Fix race condition in t7006-pager
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
next
git with Jakub Narębski modifications