?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-fe
2010-11-09 Jonathan Niedert3301 (notes): use test_expect_code for clarity
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-11-09 Jonathan Niedert1400 (update-ref): use test_must_fail
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-11-09 Jonathan Niedert1502 (rev-parse --parseopt): test exit code from "-h"
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-11-09 Jonathan Niedert6022 (renaming merge): chain test commands with &&
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-11-09 Jonathan Niedertest-lib: introduce test_line_count to measure files
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-11-09 Jonathan Niedertests: add missing &&, batch 2
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-11-09 Jonathan Niedertests: add missing &&
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-11-09 Jonathan NiederDocumentation: document show -s
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-11-03 Jonathan Niederuser-manual: remote-tracking can be checked out, with...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-20 Jonathan Niederfast-import: do not clear notes in do_change_note_fanout()
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-20 Jonathan Niedert9300 (fast-import): another test for the "replace...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-18 Jonathan Niederfast-import: tighten M 040000 syntax
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-18 Jonathan Niederfast-import: filemodify after M 040000 <tree> "" crashes
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-18 Jonathan Niedertest_terminal: ensure redirections work reliably
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-18 Jonathan Niedertest_terminal: catch use without TTY prerequisite
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-18 Jonathan Niedertest-lib: allow test code to check the list of declared...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-18 Jonathan Niedersend-pack: avoid redundant "pack-objects died with...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-18 Jonathan Niedert4203 (mailmap): stop hardcoding commit ids and dates
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-14 Jonathan NiederDocumentation: update implicit "--no-index" behavior...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-14 Jonathan NiederDocumentation: expand 'git diff' SEE ALSO section
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-14 Jonathan NiederDocumentation: diff can compare blobs
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-14 Jonathan NiederDocumentation: gitrevisions is in section 7
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-08 Jonathan NiederDocumentation: No argument of ALLOC_GROW should have...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-07 Jonathan Niedercommit-tree: free commit message before exiting
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-06 Jonathan Niederxdiff: cast arguments for ctype functions to unsigned...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-06 Jonathan Niederinit: plug tiny one-time memory leak
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-03 Jonathan Niedersetup: make sure git dir path is in a permanent buffer
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-10-03 Jonathan Niederenvironment.c: remove unused variable
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-09-30 Jonathan Niedert0004 (unwritable files): simplify error handling
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-09-09 Jonathan Niedert2016 (checkout -p): add missing &&
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-09-09 Jonathan Niedert1302 (core.repositoryversion): style tweaks
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-09-09 Jonathan Niedert2105 (gitfile): add missing &&
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-09-09 Jonathan Niedert1450 (fsck): remove dangling objects
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-09-09 Jonathan Niedertests: subshell indentation stylefix
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-31 Jonathan Niedertests: simplify "missing PREREQ" message
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-31 Jonathan Niedertests: make test_might_fail fail on missing commands
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-31 Jonathan Niedertests: make test_might_fail more verbose
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-26 Jonathan Niederll-merge: replace flag argument with options struct
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-26 Jonathan Niedermerge-recursive: expose merge options for builtin merge
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-24 Jonathan Niederparse-options: clarify PARSE_OPT_NOARG description
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-24 Jonathan Niedert3302 (notes): Port to Solaris
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-24 Jonathan Niederdo not pass "git -c foo=bar" params to transport helpers
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-22 Jonathan Niederapply: handle traditional patches with space in filename
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-22 Jonathan Niedertests: exercise "git apply" with weird filenames
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-22 Jonathan Niederapply: split quoted filename handling into new function
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: remove stray backslash in show-branch...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: remove stray backslashes from "Fighting...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: do not convert ... operator to ellipses
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: avoid stray backslash in user manual
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: avoid stray backslashes in core tutorial
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: remove stray backslashes in rev-parse...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: remove backslash before ~ in fast-import...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: remove stray backslash from "git bundle...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation/technical: avoid stray backslash in parse...
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: remove backslashes in manpage synopses
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: clarify quoting in gitignore docs
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: clarify quoting in "git rm" example
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: add missing quotes to "git grep" examples
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: clarify quoting in "git add" example
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: unbreak regex in show-ref manual
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: quoting trouble in "git rm" discussion
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: tweak description of log.date
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-20 Jonathan NiederDocumentation: set a !DOCTYPE for user manual
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-19 Jonathan Niederautoconf: don't use platform regex if it lacks REG_STARTEND
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: learn --[no-]rerere-autoupdate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: notice @{-1} shorthand
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: handle --no-ff --no-commit correctly
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: --ff-only to disallow true merge
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: handle many-way octopus
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: handle -m --log correctly
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: forbid merge -s index
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-18 Jonathan Niedermerge script: allow custom strategies
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
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-08-16 Jonathan Niedert7006 (pager): add missing TTY prerequisites
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-16 Jonathan Niedermerge: let custom strategies intervene in trivial merges
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-16 Jonathan Niedert7606 (merge-theirs): modernize style
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-16 Jonathan Niedercherry-pick/revert: Use advise() for hints
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-16 Jonathan Niedercherry-pick/revert: Use error() for failure message
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-16 Jonathan NiederIntroduce advise() to print hints
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-16 Jonathan NiederEliminate “Finished cherry-pick/revert” message
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-15 Jonathan Niedert9010 (svn-fe): avoid symlinks in test
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-15 Jonathan Niedert9010 (svn-fe): use Unix-style path in URI
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-15 Jonathan Niedervcs-svn: Avoid %z in format string
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-15 Jonathan Niedervcs-svn: Rename dirent pool to build on Windows
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
2010-08-15 Jonathan Niedercompat: add strtok_r()
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
 commit | commitdiff | tree
next
ramsay's fork of git