| 2010-08-06 | merge-recursive --renormalize Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | rerere: never renormalize Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | rerere: migrate to parse-options API Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | t4200 (rerere): modernize style Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | ll-merge: let caller decide whether to renormalize Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | ll-merge: make flag easier to populate Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | Documentation/technical: document ll_merge Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | merge-trees: let caller decide whether to renormalize Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | merge-trees: push choice to renormalize away from low... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | t6038 (merge.renormalize): check that it can be turned off Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | t6038 (merge.renormalize): try checkout -m and cherry... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-08-06 | t6038 (merge.renormalize): style nitpicks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-06-14 | git-svn: strip off leading slashes on --trunk argument Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-06-13 | add-interactive: Clarify “remaining hunks in the file” Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-06-11 | Documentation/checkout: clarify description Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-06-11 | rebase -i -p: document shortcomings Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-06-02 | DWIM 'git show -5' to 'git show --do-walk -5' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-06-01 | gitignore.5: Clarify matching rules Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-06-01 | rebase: improve error message when upstream argument... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-06-01 | Documentation/checkout: clarify description Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-28 | fsck: fix bogus commit header check Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-20 | Add git remote set-branches Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-20 | post-receive-email: document command-line mode Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | git svn: avoid uninitialized var in 'reset' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Makefile: let header dependency checker override COMPUTE_HEA... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Makefile: fix header dependency checker to allow NO_CURL... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Documentation/notes: nitpicks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Documentation/notes: clean up description of rewriting... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Documentation/notes: simplify treatment of default... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Documentation/log: add a CONFIGURATION section Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Documentation/notes: simplify treatment of default... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Documentation/notes: add configuration section Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Documentation/notes: describe content of notes blobs Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-09 | Documentation/notes: document format of notes trees Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-08 | cherry-pick: do not dump core when iconv fails Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-08 | pretty: initialize new cmt_fmt_map to 0 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-08 | adapt request-pull tests for new pull request format Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-06 | test-lib: some shells do not let $? propagate into... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-04 | shortlog: Document and test --format option Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-04 | t4201 (shortlog): Test output format with multiple... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-04 | t4201 (shortlog): guard setup with test_expect_success Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-04 | Documentation/shortlog: scripted users should not rely... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-04 | commit --amend: cope with missing display name Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-04 | test-lib: Let tests specify commands to be run at end... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-01 | fsck: check ident lines in commit objects Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-01 | request-pull: protect against OPTIONS_KEEPDASHDASH... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-05-01 | tests for request-pull Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-22 | Documentation/Makefile: fix interrupted builds of user... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-20 | fix "bundle --stdin" segfault Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-20 | t5704 (bundle): add tests for bundle --stdin Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-17 | tag -v: use RUN_GIT_CMD to run verify-tag Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-15 | Document new "already-merged" rule for branch -d Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-15 | Add .depend directories to .gitignore Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-15 | t7006: guard cleanup with test_expect_success Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-13 | t5800: testgit helper requires Python support Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-11 | t7400: clarify submodule update tests Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-11 | t7400: clarify 'submodule add' tests Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-11 | t7400: split setup into multiple tests Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-04 | Teach mailinfo %< as an alternative scissors mark Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-04-03 | Makefile: future-proof Cygwin version check Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | merge-recursive: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | cherry-pick, revert: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | revert: clarify label on conflict hunks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | compat: add mempcpy() Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | checkout -m --conflict=diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | merge_trees(): add ancestor label parameter for diff3... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | merge_file(): add comment explaining behavior wrt conflict... Signed-off-by: Jonathan Nieder <jrnieder@mgila.com> |
diff | tree |
| 2010-03-21 | checkout --conflict=diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | ll_merge(): add ancestor label parameter for diff3... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | merge-file --diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | xdl_merge(): move file1 and file2 labels to xmparam... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | xdl_merge(): add optional ancestor label to diff3-style... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | tests: document cherry-pick behavior in face of conflicts Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | tests: document format of conflicts from checkout -m Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-21 | revert: fix tiny memory leak in cherry-pick --ff Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-20 | Makefile: Fix occasional GIT-CFLAGS breakage Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-20 | Makefile: Fix CDPATH problem Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-20 | gitk: Don't clobber "Remember this view" setting Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-03-20 | gitk: Add comments to explain encode_view_opts and... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-28 | Makefile: clarify definition of TEST_OBJS Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-23 | am: remove rebase-apply directory before gc Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-22 | tests: Fix race condition in t7006-pager Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-21 | t7006-pager: if stdout is not a terminal, make a new one Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-20 | tests: Add tests for automatic use of pager Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | am: Fix launching of pager Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | git svn: Fix launching of pager Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | git.1: Clarify the behavior of the --paginate option Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | Make 'git var GIT_PAGER' always print the configured... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-02-15 | Fix 'git var' usage synopsis Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-31 | Makefile: always remove .depend directories on 'make... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-31 | Makefile: tuck away generated makefile fragments in... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-31 | Do not install shell libraries executable Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-27 | Teach Makefile to check header dependencies Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-27 | Makefile: list standalone program object files in PROGRAM_OBJS Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: lazily compute header dependencies Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: list generated object files in OBJECTS Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: disable default implicit rules Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: rearrange dependency rules Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Makefile: transport.o depends on branch.h now Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
diff | tree |
| 2010-01-26 | Merge branch 'master' of git://repo.or.cz/alt-git into... |
diff | tree |